款项确认完善。

开票申请管理基础代码生成。
开票申请分页查询列表接口开发。

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillApplication.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplication <br/>
+ * Description: 开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票申请表", description = "开票申请表")
+@TableName("fin_bill_application")
+public class FinBillApplication extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("单台开票金额")
+    private BigDecimal oneBillMoney; // 单台开票金额
+	@ApiModelProperty("开票金额合计")
+    private BigDecimal totalBillMoney; // 开票金额合计
+	@ApiModelProperty("开票状态")
+    private String billState; // 开票状态
+    @ApiModelProperty("车辆总台数")
+    private Integer num; // 车辆总台数
+    @ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxDto.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo <br/>
+ * Description: 开票申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class FinBillApplicationAppendxDto implements Vo {
+
+    @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-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo <br/>
+ * Description: 开票申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class FinBillApplicationAppendxVo implements Vo {
+
+    @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-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo <br/>
+ * Description: 开票申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票申请表 视图数据详情", description = "开票申请表 视图数据详情")
+public class FinBillApplicationDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+	@ApiModelProperty("开票金额合计")
+    private String totalBillMoney; // 开票金额合计
+	@ApiModelProperty("开票状态")
+    private String billState; // 开票状态
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+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-fin(开票申请管理) <br/>
+ * File: FinBillApplicationDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto <br/>
+ * Description: 开票申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票申请表 数据传输对象", description = "开票申请表 数据传输对象")
+public class FinBillApplicationDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+	@ApiModelProperty("开票金额合计")
+    private String totalBillMoney; // 开票金额合计
+	@ApiModelProperty("开票状态")
+    private String billState; // 开票状态
+    @ApiModelProperty("附件类型")
+    private String fileType; // 附件类型
+    @ApiModelProperty("开票车辆信息")
+    private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
+    @ApiModelProperty("附件信息")
+    private List<FinBillApplicationAppendxDto> finBillApplicationAppendxs; // 附件信息
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillApplicationFeign.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign <br/>
+ * Description: 开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票申请表")
+@FeignClient(
+        contextId = "anrui-fin-FinBillApplication",
+        name = "anrui-fin",
+        path = "v1/finbillapplication",
+        fallback = FinBillApplicationFeignFallback.class)
+public interface FinBillApplicationFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<FinBillApplicationVo>> listPage(@RequestBody PagerQuery<FinBillApplicationQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody FinBillApplicationDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillApplicationFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeignFallback <br/>
+ * Description: 开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class FinBillApplicationFeignFallback implements FinBillApplicationFeign {
+
+	@Override
+	public ResultBean<PagerVo<FinBillApplicationVo>> listPage(PagerQuery<FinBillApplicationQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbillapplication/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(FinBillApplicationDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbillapplication/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbillapplication/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbillapplication/fetchDetailsBySid无法访问");
+	}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationQuery.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery <br/>
+ * Description: 开票申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票申请表 查询条件", description = "开票申请表 查询条件")
+public class FinBillApplicationQuery implements Query {
+
+    @ApiModelProperty("业务员sid")
+    private String staffSid; // 业务员sid
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+    @ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+    @ApiModelProperty("申请开始日期")
+    private String applyStartDate; // 申请开始日期
+    @ApiModelProperty("申请结束日期")
+    private String applyEndDate; // 申请结束日期
+	@ApiModelProperty("开票状态")
+    private String billState; // 开票状态
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillapplication;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo <br/>
+ * Description: 开票申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票申请表 视图数据对象", description = "开票申请表 视图数据对象")
+public class FinBillApplicationVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("合同sid")
+    private String contractSid; // 合同sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+	@ApiModelProperty("开票金额合计")
+    private String totalBillMoney; // 开票金额合计
+	@ApiModelProperty("开票状态")
+    private String billState; // 开票状态
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFile.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+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;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFile.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFile <br/>
+ * Description: 开票附件关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票附件关联表", description = "开票附件关联表")
+@TableName("fin_bill_file")
+public class FinBillFile extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("附件类型")
+    private String fileType; // 附件类型
+	@ApiModelProperty("附件sid")
+    private String fileSid; // 附件sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDetailsVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileVo <br/>
+ * Description: 开票附件关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票附件关联表 视图数据详情", description = "开票附件关联表 视图数据详情")
+public class FinBillFileDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("附件类型")
+    private String fileType; // 附件类型
+	@ApiModelProperty("附件sid")
+    private String fileSid; // 附件sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileDto <br/>
+ * Description: 开票附件关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票附件关联表 数据传输对象", description = "开票附件关联表 数据传输对象")
+public class FinBillFileDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("附件类型")
+    private String fileType; // 附件类型
+	@ApiModelProperty("附件sid")
+    private String fileSid; // 附件sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillFileFeign.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileFeign <br/>
+ * Description: 开票附件关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票附件关联表")
+@FeignClient(
+        contextId = "anrui-fin-FinBillFile",
+        name = "anrui-fin",
+        path = "v1/finbillfile",
+        fallback = FinBillFileFeignFallback.class)
+public interface FinBillFileFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<FinBillFileVo>> listPage(@RequestBody PagerQuery<FinBillFileQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody FinBillFileDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinBillFileDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillFileFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileFeignFallback <br/>
+ * Description: 开票附件关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class FinBillFileFeignFallback implements FinBillFileFeign {
+
+	@Override
+	public ResultBean<PagerVo<FinBillFileVo>> listPage(PagerQuery<FinBillFileQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbillfile/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(FinBillFileDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbillfile/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbillfile/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<FinBillFileDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbillfile/fetchDetailsBySid无法访问");
+	}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileQuery.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileQuery.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileQuery <br/>
+ * Description: 开票附件关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票附件关联表 查询条件", description = "开票附件关联表 查询条件")
+public class FinBillFileQuery implements Query {
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("附件类型")
+    private String fileType; // 附件类型
+	@ApiModelProperty("附件sid")
+    private String fileSid; // 附件sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileVo <br/>
+ * Description: 开票附件关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票附件关联表 视图数据对象", description = "开票附件关联表 视图数据对象")
+public class FinBillFileVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("附件类型")
+    private String fileType; // 附件类型
+	@ApiModelProperty("附件sid")
+    private String fileSid; // 附件sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+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;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicle.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle <br/>
+ * Description: 开票车辆信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票车辆信息表", description = "开票车辆信息表")
+@TableName("fin_bill_vehicle")
+public class FinBillVehicle extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("挂靠公司sid")
+    private String billNameSid; // 挂靠公司sid
+	@ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDetailsVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo <br/>
+ * Description: 开票车辆信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票车辆信息表 视图数据详情", description = "开票车辆信息表 视图数据详情")
+public class FinBillVehicleDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("挂靠公司sid")
+    private String billNameSid; // 挂靠公司sid
+	@ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto <br/>
+ * Description: 开票车辆信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票车辆信息表 数据传输对象", description = "开票车辆信息表 数据传输对象")
+public class FinBillVehicleDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("挂靠公司sid")
+    private String billNameSid; // 挂靠公司sid
+	@ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillVehicleFeign.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign <br/>
+ * Description: 开票车辆信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票车辆信息表")
+@FeignClient(
+        contextId = "anrui-fin-FinBillVehicle",
+        name = "anrui-fin",
+        path = "v1/finbillvehicle",
+        fallback = FinBillVehicleFeignFallback.class)
+public interface FinBillVehicleFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<FinBillVehicleVo>> listPage(@RequestBody PagerQuery<FinBillVehicleQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody FinBillVehicleDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinBillVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+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-fin(开票申请管理) <br/>
+ * File: FinBillVehicleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeignFallback <br/>
+ * Description: 开票车辆信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class FinBillVehicleFeignFallback implements FinBillVehicleFeign {
+
+	@Override
+	public ResultBean<PagerVo<FinBillVehicleVo>> listPage(PagerQuery<FinBillVehicleQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbillvehicle/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(FinBillVehicleDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbillvehicle/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbillvehicle/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<FinBillVehicleDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbillvehicle/fetchDetailsBySid无法访问");
+	}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleQuery.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleQuery.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleQuery <br/>
+ * Description: 开票车辆信息表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票车辆信息表 查询条件", description = "开票车辆信息表 查询条件")
+public class FinBillVehicleQuery implements Query {
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("挂靠公司sid")
+    private String billNameSid; // 挂靠公司sid
+	@ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillvehicle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo <br/>
+ * Description: 开票车辆信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票车辆信息表 视图数据对象", description = "开票车辆信息表 视图数据对象")
+public class FinBillVehicleVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("车架号")
+    private String VIN; // 车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("挂靠公司sid")
+    private String billNameSid; // 挂靠公司sid
+	@ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -82,4 +82,6 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
     private Integer auditState; // 审核状态
+    @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
+    private Integer paymentState; // 审核状态
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@@ -83,7 +83,7 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("已选应收款项明细")
-    private List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos; // 已选应收款项明细
+    private List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetaileds; // 已选应收款项明细
     @ApiModelProperty("打款凭证附件")
     private List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs; // 打款凭证附件
     @ApiModelProperty("汇款确认书附件")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@@ -86,8 +86,10 @@ public class FinCollectionConfirmationDto implements Dto {
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
+    private Integer paymentState; // 审核状态
     @ApiModelProperty("已选应收款项明细")
-    private List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos; // 已选应收款项明细
+    private List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetaileds; // 已选应收款项明细
     @ApiModelProperty("打款凭证附件")
     private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件
     @ApiModelProperty("汇款确认书附件")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java

@@ -48,8 +48,10 @@ import lombok.Data;
 @Data
 public class FinCollectionConfirmationQuery implements Query {
     
-	@ApiModelProperty("收款日期")
-    private String collectionDate; // 收款日期
+	@ApiModelProperty("收款开始日期")
+    private String collectionStartDate; // 收款开始日期
+    @ApiModelProperty("收款结束日期")
+    private String collectionEndDate; // 收款结束日期
 	@ApiModelProperty("收款银行")
     private String collectionBank; // 收款银行
 	@ApiModelProperty("收款方式key")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "客户账单汇总 视图数据对象", description = "客户账单汇总 视图数据对象")
+@Data
+public class CustomerBillSummaryVo implements Vo {
+
+    @ApiModelProperty("应收未收款项sid")
+    private String sid; // 应收未收款项sid
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("合同编号sid")
+    private String contractSid; // 合同编号sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    @ApiModelProperty("认款状态")
+    private String subscriptionState; // 认款状态
+	@ApiModelProperty("车架号")
+    @JsonProperty("VIN")
+    private String VIN; // 车架号
+	@ApiModelProperty("联系电话")
+    private String customerPhone; // 联系电话
+	@ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+	@ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney; // 当前应收金额
+    @ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+    @ApiModelProperty("未认款金额")
+    private String noSubscriptionMoney; // 未认款金额
+    @ApiModelProperty("生成时间")
+    private String createTime; // 生成时间
+    @ApiModelProperty("审核时间")
+    private String auditDate; // 审核时间
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -73,7 +73,7 @@ public interface FinUncollectedReceivablesDetailedFeign {
 
     @ApiOperation("客户账单汇总分页列表")
     @PostMapping("/customerBillListPage")
-    public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillListPage(@RequestBody PagerQuery<FinUncollectedReceivablesDetailedQuery> pq);
+    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(@RequestBody PagerQuery<FinUncollectedReceivablesDetailedQuery> pq);
 
     @ApiOperation("客户账单明细分页列表")
     @PostMapping("/customerBillDetailedListPage")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -66,7 +66,7 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	}
 
 	@Override
-	public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+	public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
 		return null;
 	}
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillapplication;
+
+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.fin.api.finbillapplication.FinBillApplication;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationMapper.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationMapper <br/>
+ * Description: 开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication> {
+
+	//@Update("update fin_bill_application set name=#{msg} where id=#{id}")
+	//IPage<FinBillApplicationVo> voPage(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) QueryWrapper<FinBillApplication> qw);
+	
+	IPage<FinBillApplicationVo> selectPageVo(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
+	
+	List<FinBillApplicationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
+	
+	@Select("select * from fin_bill_application")
+	List<FinBillApplicationVo> selectListVo();
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.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.fin.biz.finbillapplication.FinBillApplicationMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
+		SELECT
+		*
+		FROM
+		fin_bill_application fba
+		LEFT JOIN fin_bill_vehicle fbv
+		ON fba.`sid` = fbv.`billAppSid`  <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
+		SELECT * FROM fin_bill_application <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillapplication;
+
+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.fin.api.finbillapplication.FinBillApplication;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationRest <br/>
+ * Description: 开票申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票申请表")
+@RestController("com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationRest")
+@RequestMapping("v1/finbillapplication")
+public class FinBillApplicationRest implements FinBillApplicationFeign {
+
+	@Autowired
+	private FinBillApplicationService finBillApplicationService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<FinBillApplicationVo>> listPage(@RequestBody PagerQuery<FinBillApplicationQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<FinBillApplicationVo> pv = finBillApplicationService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody FinBillApplicationDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		finBillApplicationService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		finBillApplicationService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		FinBillApplicationDetailsVo vo = finBillApplicationService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -0,0 +1,135 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillapplication;
+
+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.fin.api.finbillapplication.FinBillApplication;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillApplicationService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService <br/>
+ * Description: 开票申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinBillApplicationService extends MybatisBaseService<FinBillApplicationMapper, FinBillApplication> {
+    private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", query.getUseOrgSid());
+        qw.eq("createBySid", query.getStaffSid());
+		if (StringUtils.isNotBlank(query.getContractNo())) {
+			qw.eq("fba.contractNo", query.getContractNo());
+		}
+		if (StringUtils.isNotBlank(query.getCustomerName())) {
+			qw.eq("fba.customerName", query.getCustomerName());
+		}
+		if (StringUtils.isNotBlank(query.getBillTypeKey())) {
+			qw.eq("fbv.billTypeKey", query.getBillTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getBillName())) {
+			qw.eq("fbv.billName", query.getBillName());
+		}
+		String applyStartDate = query.getApplyStartDate();
+		String applyEndDate = query.getApplyEndDate();
+		qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
+				);
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.eq("fba.createByName", query.getCreateByName());
+		}
+		if (StringUtils.isNotBlank(query.getBillState())) {
+			qw.eq("fba.billState", query.getBillState());
+		}
+		return qw;
+    }
+
+    public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) {
+        FinBillApplicationQuery query = pq.getParams();
+        QueryWrapper<FinBillApplication> qw = createQueryWrapper(query);
+        IPage<FinBillApplication> page = PagerUtil.queryToPage(pq);
+        IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(FinBillApplicationDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {//新增
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(FinBillApplicationDto dto) {
+        FinBillApplication entity = new FinBillApplication();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(FinBillApplicationDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        FinBillApplication entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public FinBillApplicationDetailsVo fetchDetailsVoBySid(String sid) {
+        FinBillApplication entity = fetchBySid(sid);
+        FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillfile;
+
+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.fin.api.finbillfile.FinBillFile;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileMapper.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillfile.FinBillFileMapper <br/>
+ * Description: 开票附件关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
+
+	//@Update("update fin_bill_file set name=#{msg} where id=#{id}")
+	//IPage<FinBillFileVo> voPage(IPage<FinBillFile> page, @Param(Constants.WRAPPER) QueryWrapper<FinBillFile> qw);
+	
+	IPage<FinBillFileVo> selectPageVo(IPage<FinBillFile> page, @Param(Constants.WRAPPER) Wrapper<FinBillFile> qw);
+	
+	List<FinBillFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillFile> qw);
+	
+	@Select("select * from fin_bill_file")
+	List<FinBillFileVo> selectListVo();
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.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.fin.biz.finbillfile.FinBillFileMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
+		SELECT * FROM fin_bill_file <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
+		SELECT * FROM fin_bill_file <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillfile;
+
+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.fin.api.finbillfile.FinBillFile;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileQuery;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileDetailsVo;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileFeign;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillfile.FinBillFileRest <br/>
+ * Description: 开票附件关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票附件关联表")
+@RestController("com.yxt.anrui.fin.biz.finbillfile.FinBillFileRest")
+@RequestMapping("v1/finbillfile")
+public class FinBillFileRest implements FinBillFileFeign {
+
+	@Autowired
+	private FinBillFileService finBillFileService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<FinBillFileVo>> listPage(@RequestBody PagerQuery<FinBillFileQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<FinBillFileVo> pv = finBillFileService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody FinBillFileDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		finBillFileService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		finBillFileService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<FinBillFileDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		FinBillFileDetailsVo vo = finBillFileService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillfile;
+
+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.fin.api.finbillfile.FinBillFile;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileQuery;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileDetailsVo;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillFileService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillfile.FinBillFileService <br/>
+ * Description: 开票附件关联表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 17:07:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, FinBillFile> {
+	private QueryWrapper<FinBillFile> createQueryWrapper(FinBillFileQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<FinBillFile> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<FinBillFileVo> listPageVo(PagerQuery<FinBillFileQuery> pq) {
+		FinBillFileQuery query = pq.getParams();
+		QueryWrapper<FinBillFile> qw = createQueryWrapper(query);
+		IPage<FinBillFile> page = PagerUtil.queryToPage(pq);
+		IPage<FinBillFileVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<FinBillFileVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(FinBillFileDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(FinBillFileDto dto){
+		FinBillFile entity = new FinBillFile();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(FinBillFileDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		FinBillFile entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public FinBillFileDetailsVo fetchDetailsVoBySid(String sid){
+		FinBillFile entity = fetchBySid(sid);
+		FinBillFileDetailsVo vo = new FinBillFileDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillvehicle;
+
+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.fin.api.finbillvehicle.FinBillVehicle;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleMapper.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleMapper <br/>
+ * Description: 开票车辆信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
+
+	//@Update("update fin_bill_vehicle set name=#{msg} where id=#{id}")
+	//IPage<FinBillVehicleVo> voPage(IPage<FinBillVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<FinBillVehicle> qw);
+	
+	IPage<FinBillVehicleVo> selectPageVo(IPage<FinBillVehicle> page, @Param(Constants.WRAPPER) Wrapper<FinBillVehicle> qw);
+	
+	List<FinBillVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillVehicle> qw);
+	
+	@Select("select * from fin_bill_vehicle")
+	List<FinBillVehicleVo> selectListVo();
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.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.fin.biz.finbillvehicle.FinBillVehicleMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo">
+		SELECT * FROM fin_bill_vehicle <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo">
+		SELECT * FROM fin_bill_vehicle <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillvehicle;
+
+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.fin.api.finbillvehicle.FinBillVehicle;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleQuery;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleRest <br/>
+ * Description: 开票车辆信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票车辆信息表")
+@RestController("com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleRest")
+@RequestMapping("v1/finbillvehicle")
+public class FinBillVehicleRest implements FinBillVehicleFeign {
+
+	@Autowired
+	private FinBillVehicleService finBillVehicleService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<FinBillVehicleVo>> listPage(@RequestBody PagerQuery<FinBillVehicleQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<FinBillVehicleVo> pv = finBillVehicleService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody FinBillVehicleDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		finBillVehicleService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		finBillVehicleService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<FinBillVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		FinBillVehicleDetailsVo vo = finBillVehicleService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbillvehicle;
+
+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.fin.api.finbillvehicle.FinBillVehicle;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleQuery;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票申请管理) <br/>
+ * File: FinBillVehicleService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService <br/>
+ * Description: 开票车辆信息表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-26 10:27:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapper, FinBillVehicle> {
+	private QueryWrapper<FinBillVehicle> createQueryWrapper(FinBillVehicleQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<FinBillVehicle> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<FinBillVehicleVo> listPageVo(PagerQuery<FinBillVehicleQuery> pq) {
+		FinBillVehicleQuery query = pq.getParams();
+		QueryWrapper<FinBillVehicle> qw = createQueryWrapper(query);
+		IPage<FinBillVehicle> page = PagerUtil.queryToPage(pq);
+		IPage<FinBillVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<FinBillVehicleVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(FinBillVehicleDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(FinBillVehicleDto dto){
+		FinBillVehicle entity = new FinBillVehicle();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(FinBillVehicleDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		FinBillVehicle entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public FinBillVehicleDetailsVo fetchDetailsVoBySid(String sid){
+		FinBillVehicle entity = fetchBySid(sid);
+		FinBillVehicleDetailsVo vo = new FinBillVehicleDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -85,4 +85,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
 
     @Update("update fin_collection_confirmation set auditState = 3 where sid = #{sid}")
     void cashierConfirm(String sid);
+
+    @Update("update fin_collection_confirmation set paymentState = #{paymentState} where sid = #{sid}")
+    void updatePaymentStateBySid(@Param("sid") String sid,@Param("paymentState") int paymentState);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -63,7 +63,6 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<FinCollectionConfirmationQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<FinCollectionConfirmationVo> pv = finCollectionConfirmationService.listPageVo(pq);
-
         return rb.success().setData(pv);
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -101,9 +101,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (StringUtils.isNotBlank(query.getCreateBySid())) {
             qw.eq("createBySid", query.getCreateBySid());
         }
-        if (StringUtils.isNotBlank(query.getCollectionDate())) {
-            qw.eq("collectionDate", query.getCollectionDate());
-        }
+        String collectionStartDate = query.getCollectionStartDate();
+        String collectionEndDate = query.getCollectionEndDate();
+        qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+                );
         if (StringUtils.isNotBlank(query.getCollectionBank())) {
             qw.eq("collectionBank", query.getCollectionBank());
         }
@@ -111,7 +113,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             qw.eq("collectionTypeKey", query.getCollectionTypeKey());
         }
         if (StringUtils.isNotBlank(query.getSubscriptionState())) {
-            qw.eq("subscriptionState", query.getSubscriptionState());
+            qw.eq("paymentState", query.getSubscriptionState());
         }
         return qw;
     }
@@ -130,7 +132,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
                 Integer isDept = data1.getIsDept();
                 String psid = data1.getPsid();
-                if (isDept == 0 && !psid.equals(0)){
+                if (isDept == 0 && !psid.equals(0)) {
                     orgSidPath = s;
                     break;
                 }
@@ -174,10 +176,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean saveAllDto(FinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
-        List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetailedDtos();
+        List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
         List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
+        if (paymentVoucherAppendixs.size() == 0) {
+            return rb.setMsg("请上传打款凭证附件");
+        }
         List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
+        if (remittanceConfirmationAppendixs.size() == 0) {
+            return rb.setMsg("请上传汇款确认书附件");
+        }
         String sid1 = finCollectionConfirmation.getSid();
         BeanUtil.copyProperties(dto, finCollectionConfirmation);
         finCollectionConfirmation.setSid(sid1);
@@ -195,7 +203,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
                 Integer isDept = data1.getIsDept();
                 String psid = data1.getPsid();
-                if (isDept == 0 && !psid.equals(0)){
+                if (isDept == 0 && !psid.equals(0)) {
                     orgSidPath = s;
                     break;
                 }
@@ -266,8 +274,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
         }
-        finCollectionConfirmation.setBalance(totalSubscriptionMone);
+        finCollectionConfirmation.setBalance(subtract);
         finCollectionConfirmation.setAuditState(1);
+        finCollectionConfirmation.setPaymentState(1);
         save(finCollectionConfirmation);
         return rb.success().setMsg("添加成功");
     }
@@ -276,30 +285,39 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo();
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
-        FinCollectionConfirmationAppendixVo finCollectionConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
+        FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
+        FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
         ArrayList<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
         ArrayList<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
         String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl();
         String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();
         String[] split1 = remittanceConfirmationUrl.split(",");
         String[] split = paymentVoucherUrl.split(",");
+        BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
         for (String s : split) {
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            BeanUtil.copyProperties(data,finCollectionConfirmationAppendixVo);
-            paymentVoucherAppendixs.add(finCollectionConfirmationAppendixVo);
+            String filePath = data.getFilePath();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            filePath = urlPrefix + filePath;
+            BeanUtil.copyProperties(data, paymentVoucherAppendixVo);
+            paymentVoucherAppendixVo.setFilePath(filePath);
+            paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
         }
+        finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs);
         for (String s : split1) {
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            BeanUtil.copyProperties(data,finCollectionConfirmationAppendixVo);
-            remittanceConfirmationAppendixs.add(finCollectionConfirmationAppendixVo);
+            String filePath = data.getFilePath();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            filePath = urlPrefix + filePath;
+            BeanUtil.copyProperties(data, remittanceConfirmationAppendixVo);
+            remittanceConfirmationAppendixVo.setFilePath(filePath);
+            remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
         }
-        finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs);
         finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
-        BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
-        finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetailedVos(finSelectedReceivablesDetailedVos);
+        finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(finSelectedReceivablesDetailedVos);
         return rb.success().setData(finCollectionConfirmationDetailsVo);
     }
 
@@ -568,10 +586,37 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean rb = ResultBean.fireFail();
         baseMapper.cashierConfirm(sid);
         int auditState = 1;
+        BigDecimal totalSubscriptionMoney = new BigDecimal(0);
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
             String sid1 = finSelectedReceivablesDetailedVo.getSid();
             finSelectedReceivablesDetailedService.cashierConfirm(sid1);
+            finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1);
+            BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
+            totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney);
+            String vin = finSelectedReceivablesDetailedVo.getVIN();
+            String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
+            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
+            String sid2 = finUncollectedReceivablesDetailedVo.getSid();
+            BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
+            BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
+            if (subtract.compareTo(BigDecimal.ZERO) == 0){
+                int subscriptionState = 3;
+                finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2,subscriptionState);
+            }else {
+                int subscriptionState = 2;
+                finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2,subscriptionState);
+            }
+        }
+        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
+        BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
+        BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMoney);
+        if (subtract.compareTo(BigDecimal.ZERO) == 0){
+            int paymentState = 3;
+            baseMapper.updatePaymentStateBySid(sid,paymentState);
+        }else {
+            int paymentState = 2;
+            baseMapper.updatePaymentStateBySid(sid,paymentState);
         }
         return rb.success().setMsg("款项确认成功");
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -90,4 +90,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     List<FinSelectedReceivablesDetailedVo> selectGroupConAndRecAndPay();
 
     List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay();
+
+    @Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}")
+    void updateAuditDateBySid(String sid1);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -60,13 +60,16 @@
 
     <select id="selectDetailedGroupConAndRecAndPay"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
-        SELECT receivablesName,
-               subscriptionMoney,
-               auditDate,
-               remarks
-        FROM fin_selected_receivables_detailed fsrd
+        SELECT
+                receivablesName,
+                subscriptionMoney,
+                auditDate,
+                remarks
+        FROM
+                fin_selected_receivables_detailed fsrd
         WHERE auditState = 3
-        ORDER BY auditDate GROUP BY contractNo,
-  receivablesName
+        GROUP BY contractNo,
+                 receivablesName
+        ORDER BY auditDate
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -197,4 +197,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay() {
         return baseMapper.selectDetailedGroupConAndRecAndPay();
     }
+
+    public void updateAuditDateBySid(String sid1) {
+        baseMapper.updateAuditDateBySid(sid1);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -69,7 +69,10 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName);
 
 	@Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}")
-    void updateCurRecMoneyBySid(String curRecMoney, String sid);
+    void updateCurRecMoneyBySid(@Param("curRecMoney") String curRecMoney,@Param("sid") String sid);
 
 	List<FinUncollectedReceivablesDetailedVo> selectGroupConAndRecAndPay(String contractNo, String receivablesName, String paymentTypeValue);
+
+	@Update("update fin_uncollected_receivables_detailed set subscriptionState = #{subscriptionState} where sid = #{sid2}")
+	void updateSubscriptionStateBySid(@Param("sid2") String sid2, @Param("subscriptionState") int subscriptionState);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -6,6 +6,7 @@
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
 		SELECT
 		furd.`customerName`,
+		furd.`contractSid`,
 		furd.`contractNo`,
 		furd.`paymentTypeValue`,
 		furd.`receivablesName`,

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -84,9 +84,9 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
 	}
 
 	@Override
-	public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+	public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
 		ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinUncollectedReceivablesDetailedVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
+		PagerVo<CustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
 		return rb.success().setData(pv);
 	}
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -88,7 +88,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("createBySid", query.getCreateBySid());
         String[] sids = query.getSids();
-        if (sids.length != 0){
+        if (sids != null){
             for (String sid : sids) {
                 if (StringUtils.isNotBlank(sid)) {
                     qw.ne("sid", sid);
@@ -96,13 +96,13 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
             }
         }
         if (StringUtils.isNotBlank(query.getContractNo())) {
-            qw.eq("contractNo", query.getContractNo());
+            qw.like("contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.eq("customerName", query.getCustomerName());
+            qw.like("customerName", query.getCustomerName());
         }
         if (StringUtils.isNotBlank(query.getCustomerPhone())) {
-            qw.eq("customerPhone", query.getCustomerPhone());
+            qw.like("customerPhone", query.getCustomerPhone());
         }
         if (StringUtils.isNotBlank(query.getPaymentTypeKey())) {
             qw.eq("paymentTypeKey", query.getPaymentTypeKey());
@@ -163,21 +163,40 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         baseMapper.updateCurRecMoneyBySid(curRecMoney, sid);
     }
 
-    public PagerVo<FinUncollectedReceivablesDetailedVo> listPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+    public PagerVo<CustomerBillSummaryVo> listPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
+        String staffSid = params.getCreateBySid();
+        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
+        List<SysStaffOrgVo> data2 = sysStaffOrgListByStaffSid.getData();
+        String orgSidPath = "";
+        for (SysStaffOrgVo datum : data2) {
+            orgSidPath = datum.getOrgSidPath();
+            String[] split = orgSidPath.split("/");
+            for (String s : split) {
+                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
+                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
+                Integer isDept = data1.getIsDept();
+                String psid = data1.getPsid();
+                if (isDept == 0 && !psid.equals(0)){
+                    orgSidPath = s;
+                    break;
+                }
+            }
+        }
+        params.setUseOrgSid(orgSidPath);
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(params);
         IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
         IPage<FinUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
         List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
         for (FinUncollectedReceivablesDetailedVo record : records) {
-            BigDecimal totalDeposit = null;
-            BigDecimal totalPrice = null;
-            BigDecimal noSubscriptionMoney = null;
-            String contractSid = record.getContractSid();
+            BigDecimal totalDeposit = new BigDecimal(0);
+            BigDecimal totalPrice = new BigDecimal(0);
+            BigDecimal noSubscriptionMoney = new BigDecimal(0);
+            String sid = record.getContractSid();
             String contractNo = record.getContractNo();
             String receivablesName = record.getReceivablesName();
             String paymentTypeValue = record.getPaymentTypeValue();
-            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid);
+            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid);
             CommonContractVo data = commonContractVoResultBean.getData();
             if (receivablesName.equals("订金")) {
                 BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit());
@@ -218,25 +237,44 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 }
             }
         }
-        PagerVo<FinUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<CustomerBillSummaryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
     public PagerVo<FinUncollectedReceivablesDetailedVo> detailedListPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
+        String staffSid = params.getCreateBySid();
+        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
+        List<SysStaffOrgVo> data2 = sysStaffOrgListByStaffSid.getData();
+        String orgSidPath = "";
+        for (SysStaffOrgVo datum : data2) {
+            orgSidPath = datum.getOrgSidPath();
+            String[] split = orgSidPath.split("/");
+            for (String s : split) {
+                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
+                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
+                Integer isDept = data1.getIsDept();
+                String psid = data1.getPsid();
+                if (isDept == 0 && !psid.equals(0)){
+                    orgSidPath = s;
+                    break;
+                }
+            }
+        }
+        params.setUseOrgSid(orgSidPath);
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(params);
         IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
         IPage<FinUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
         List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
         for (FinUncollectedReceivablesDetailedVo record : records) {
-            BigDecimal totalDeposit = null;
-            BigDecimal totalPrice = null;
-            BigDecimal noSubscriptionMoney = null;
-            String contractSid = record.getContractSid();
+            BigDecimal totalDeposit = new BigDecimal(0);
+            BigDecimal totalPrice = new BigDecimal(0);
+            BigDecimal noSubscriptionMoney = new BigDecimal(0);
+            String sid = record.getContractSid();
             String contractNo = record.getContractNo();
             String receivablesName = record.getReceivablesName();
             String paymentTypeValue = record.getPaymentTypeValue();
-            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid);
+            ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid);
             CommonContractVo data = commonContractVoResultBean.getData();
             if (receivablesName.equals("订金")) {
                 BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit());
@@ -246,7 +284,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 record.setSubscriptionMoney("0");
                 record.setNoSubscriptionMoney(String.valueOf(totalDeposit));
                 List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectDetailedGroupConAndRecAndPay();
-                BigDecimal lastSubscriptionMoney = null;
+                BigDecimal lastSubscriptionMoney = new BigDecimal(0);
                 for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
                     BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
                     noSubscriptionMoney = totalDeposit.subtract(subscriptionMoney.add(lastSubscriptionMoney));
@@ -262,7 +300,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 record.setSubscriptionMoney("0");
                 record.setNoSubscriptionMoney(String.valueOf(totalPrice));
                 List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectDetailedGroupConAndRecAndPay();
-                BigDecimal lastSubscriptionMoney = null;
+                BigDecimal lastSubscriptionMoney = new BigDecimal(0);
                 for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
                     BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
                     noSubscriptionMoney = totalPrice.subtract(subscriptionMoney.add(lastSubscriptionMoney));
@@ -275,4 +313,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         PagerVo<FinUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public void updateSubscriptionStateBySid(String sid2, int subscriptionState) {
+        baseMapper.updateSubscriptionStateBySid(sid2,subscriptionState);
+    }
 }