Browse Source

款项确认完善。

盖章申请管理增删改查接口开发。
master
God 3 years ago
parent
commit
12edfea4e6
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
  2. 70
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApply.java
  3. 66
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyAppendix.java
  4. 71
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDetailsVo.java
  5. 75
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDto.java
  6. 78
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeign.java
  7. 72
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeignFallback.java
  8. 59
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyQuery.java
  9. 71
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyVo.java
  10. 65
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.java
  11. 13
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.xml
  12. 100
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyRest.java
  13. 187
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java
  14. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  15. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java
  16. 68
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java
  17. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  18. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  19. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
  20. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  21. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  22. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  23. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  24. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@ -44,7 +44,8 @@ public enum CommonAttachTypeEnum {
ARREARS("0007", "欠款提车附件"),
SCENESIGN("0008", "现场签署附件"),
PAYMENT_VOUCHER("0009", "打款凭证附件"),
REMITTAN_CECONFIRMATION("0010", "汇款确认书附件");
REMITTAN_CECONFIRMATION("0010", "汇款确认书附件"),
SEAL_APPLY("0011", "盖章附件");
/**
* 附件类型
*/

70
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApply.java

@ -0,0 +1,70 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
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: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApply.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApply <br/>
* Description: 盖章申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盖章申请表", description = "盖章申请表")
@TableName("bus_seal_apply")
public class BusSealApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请人姓名")
private String applyName; // 申请人姓名
@ApiModelProperty("盖章日期")
private String sealDate; // 盖章日期
@ApiModelProperty("盖章类型key")
private String sealTypeKey; // 盖章类型key
@ApiModelProperty("盖章类型value")
private String sealTypeValue; // 盖章类型value
@ApiModelProperty("盖章个数")
private String sealNum; // 盖章个数
@ApiModelProperty("文件名称或盖章事由")
private String fileNameOrSealReason; // 文件名称或盖章事由
@ApiModelProperty("文件路径")
private String sealFileUrl; // 文件路径
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
}

66
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyAppendix.java

@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo <br/>
* Description: 盖章申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
public class BusSealApplyAppendix 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;
}

71
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDetailsVo.java

@ -0,0 +1,71 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo <br/>
* Description: 盖章申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盖章申请表 视图数据详情", description = "盖章申请表 视图数据详情")
public class BusSealApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请人姓名")
private String applyName; // 申请人姓名
@ApiModelProperty("盖章日期")
private String sealDate; // 盖章日期
@ApiModelProperty("盖章类型key")
private String sealTypeKey; // 盖章类型key
@ApiModelProperty("盖章类型value")
private String sealTypeValue; // 盖章类型value
@ApiModelProperty("盖章个数")
private String sealNum; // 盖章个数
@ApiModelProperty("文件名称或盖章事由")
private String fileNameOrSealReason; // 文件名称或盖章事由
@ApiModelProperty("文件路径")
private String sealFileUrl; // 文件路径
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
}

75
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyDto.java

@ -0,0 +1,75 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
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: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyDto <br/>
* Description: 盖章申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盖章申请表 数据传输对象", description = "盖章申请表 数据传输对象")
public class BusSealApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("申请人姓名")
private String applyName; // 申请人姓名
@ApiModelProperty("盖章日期")
private String sealDate; // 盖章日期
@ApiModelProperty("盖章类型key")
private String sealTypeKey; // 盖章类型key
@ApiModelProperty("盖章类型value")
private String sealTypeValue; // 盖章类型value
@ApiModelProperty("盖章个数")
private String sealNum; // 盖章个数
@ApiModelProperty("文件名称或盖章事由")
private String fileNameOrSealReason; // 文件名称或盖章事由
@ApiModelProperty("文件路径")
private String sealFileUrl; // 文件路径
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("盖章附件")
private List<BusSealApplyAppendix> busSealApplyAppendices; // 盖章附件
}

78
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeign.java

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

72
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyFeignFallback.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
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: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyFeignFallback <br/>
* Description: 盖章申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class BusSealApplyFeignFallback implements BusSealApplyFeign {
@Override
public ResultBean<PagerVo<BusSealApplyVo>> listPage(PagerQuery<BusSealApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口bus_seal_apply/bussealapply/listPage无法访问");
}
@Override
public ResultBean save(BusSealApplyDto dto){
return ResultBean.fireFail().setMsg("接口bus_seal_apply/bussealapply/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口bus_seal_apply/bussealapply/delBySids无法访问");
}
@Override
public ResultBean<BusSealApplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口bus_seal_apply/bussealapply/fetchDetailsBySid无法访问");
}
}

59
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyQuery.java

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyQuery.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyQuery <br/>
* Description: 盖章申请表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盖章申请表 查询条件", description = "盖章申请表 查询条件")
public class BusSealApplyQuery implements Query {
@ApiModelProperty("盖章开始日期")
private String sealStartDate; // 盖章开始日期
@ApiModelProperty("盖章结束日期")
private String sealEndDate; // 盖章结束日期
@ApiModelProperty("文件名称或盖章事由")
private String fileNameOrSealReason; // 文件名称或盖章事由
}

71
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussealapply/BusSealApplyVo.java

@ -0,0 +1,71 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussealapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo <br/>
* Description: 盖章申请表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盖章申请表 视图数据对象", description = "盖章申请表 视图数据对象")
public class BusSealApplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请人姓名")
private String applyName; // 申请人姓名
@ApiModelProperty("盖章日期")
private String sealDate; // 盖章日期
@ApiModelProperty("盖章类型key")
private String sealTypeKey; // 盖章类型key
@ApiModelProperty("盖章类型value")
private String sealTypeValue; // 盖章类型value
@ApiModelProperty("盖章个数")
private String sealNum; // 盖章个数
@ApiModelProperty("文件名称或盖章事由")
private String fileNameOrSealReason; // 文件名称或盖章事由
@ApiModelProperty("文件路径")
private String sealFileUrl; // 文件路径
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
}

65
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.bussealapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApply;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo;
import java.util.List;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyMapper.java <br/>
* Class: com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyMapper <br/>
* Description: 盖章申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BusSealApplyMapper extends BaseMapper<BusSealApply> {
//@Update("update bus_seal_apply set name=#{msg} where id=#{id}")
//IPage<BusSealApplyVo> voPage(IPage<BusSealApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusSealApply> qw);
IPage<BusSealApplyVo> selectPageVo(IPage<BusSealApply> page, @Param(Constants.WRAPPER) Wrapper<BusSealApply> qw);
List<BusSealApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSealApply> qw);
@Select("select * from bus_seal_apply")
List<BusSealApplyVo> selectListVo();
}

13
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo">
SELECT * FROM bus_seal_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo">
SELECT * FROM bus_seal_apply <where> ${ew.sqlSegment} </where>
</select>
</mapper>

100
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyRest.java

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.bussealapply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApply;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyQuery;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyDetailsVo;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyDto;
import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyFeign;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyRest <br/>
* Description: 盖章申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "盖章申请表")
@RestController("com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyRest")
@RequestMapping("v1/bussealapply")
public class BusSealApplyRest implements BusSealApplyFeign {
@Autowired
private BusSealApplyService busSealApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusSealApplyVo>> listPage(@RequestBody PagerQuery<BusSealApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BusSealApplyVo> pv = busSealApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BusSealApplyDto dto){
ResultBean rb = ResultBean.fireFail();
busSealApplyService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
busSealApplyService.delAllBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BusSealApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BusSealApplyDetailsVo vo = busSealApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

187
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java

@ -0,0 +1,187 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.bussealapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.commonappendix.*;
import com.yxt.anrui.buscenter.api.bussealapply.*;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: bus_seal_apply(盖章申请管理) <br/>
* File: BusSealApplyService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.bussealapply.BusSealApplyService <br/>
* Description: 盖章申请表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-24 13:45:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BusSealApplyService extends MybatisBaseService<BusSealApplyMapper, BusSealApply> {
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
private QueryWrapper<BusSealApply> createQueryWrapper(BusSealApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusSealApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getFileNameOrSealReason())){
qw.like("fileNameOrSealReason",query.getFileNameOrSealReason());
}
String sealStartDate = query.getSealStartDate();
String sealEndDate = query.getSealEndDate();
qw.apply(StringUtils.isNotEmpty(sealStartDate), "date_format (sealDate,'%Y-%m-%d') >= date_format('" + sealStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(sealEndDate), "date_format (sealDate,'%Y-%m-%d') <= date_format('" + sealEndDate + "','%Y-%m-%d')"
);
return qw;
}
public PagerVo<BusSealApplyVo> listPageVo(PagerQuery<BusSealApplyQuery> pq) {
BusSealApplyQuery query = pq.getParams();
QueryWrapper<BusSealApply> qw = createQueryWrapper(query);
IPage<BusSealApply> page = PagerUtil.queryToPage(pq);
IPage<BusSealApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusSealApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BusSealApplyDto dto){
String dtoSid = dto.getSid();
String sealFilePath = "";
String sealFileUrl = "";
List<BusSealApplyAppendix> busSealApplyAppendices = dto.getBusSealApplyAppendices();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
if (StringUtils.isBlank(dtoSid)) {//新增
BusSealApply busSealApply = new BusSealApply();
String sid = busSealApply.getSid();
BeanUtil.copyProperties(dto,busSealApply);
busSealApply.setSid(sid);
for (BusSealApplyAppendix busSealApplyAppendix : busSealApplyAppendices) {
BeanUtil.copyProperties(busSealApplyAppendix,commonAppendixDto);
sealFilePath = busSealApplyAppendix.getFilePath();
if (sealFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
sealFilePath = sealFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setFilePath(sealFilePath);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setAttachType(CommonAttachTypeEnum.SEAL_APPLY.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
sealFileUrl += sealFilePath + ",";
}
}
busSealApply.setSealFileUrl(sealFileUrl.substring(0, sealFileUrl.lastIndexOf(",")));
save(busSealApply);
}
BusSealApply busSealApply = fetchBySid(dtoSid);
if (busSealApply == null){
return;
}
commonAppendixFeign.deleteFiles(dtoSid);
for (BusSealApplyAppendix busSealApplyAppendix : busSealApplyAppendices) {
BeanUtil.copyProperties(busSealApplyAppendix,commonAppendixDto);
sealFilePath = busSealApplyAppendix.getFilePath();
if (sealFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
sealFilePath = sealFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setFilePath(sealFilePath);
commonAppendixDto.setLinkSid(dtoSid);
commonAppendixDto.setAttachType(CommonAttachTypeEnum.SEAL_APPLY.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
sealFileUrl += sealFilePath + ",";
}
}
dto.setSealFileUrl(sealFileUrl.substring(0, sealFileUrl.lastIndexOf(",")));
updateBySid(dto,dtoSid);
}
public void insertByDto(BusSealApplyDto dto){
BusSealApply entity = new BusSealApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BusSealApplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BusSealApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BusSealApplyDetailsVo fetchDetailsVoBySid(String sid){
BusSealApply entity = fetchBySid(sid);
BusSealApplyDetailsVo vo = new BusSealApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
String sealFileUrl = entity.getSealFileUrl();
String[] split = sealFileUrl.split(",");
String path = "";
String sealCompleteFileUrl = "";
for (String s : split) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
path = urlPrefix + s;
sealCompleteFileUrl += path + ",";
}
vo.setSealFileUrl(sealCompleteFileUrl.substring(0,sealCompleteFileUrl.lastIndexOf(",")));
return vo;
}
public void delAllBySids(String[] sids) {
for (String sid : sids) {
deleteBySid(sid);
ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.selByLinkSid(sid);
List<CommonAppendixVo> data = listResultBean.getData();
String path = "";
for (CommonAppendixVo datum : data) {
String filePath = datum.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
path = urlPrefix + filePath;
commonAppendixFeign.deleteFilesOss(path);
}
commonAppendixFeign.deleteFiles(sid);
}
}
}

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

@ -56,8 +56,12 @@ public class FinCollectionConfirmation extends BaseEntity {
private String createByName; // 创建人接口
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
@ApiModelProperty("收款银行key")
private String collectionBankKey; // 收款银行key
@ApiModelProperty("收款银行")
private String collectionBank; // 收款银行
@ApiModelProperty("收款银行账号key")
private String collectionBankNumKey; // 收款银行账号key
@ApiModelProperty("收款银行账号")
private String collectionBankNum; // 收款银行账号
@ApiModelProperty("收款方式key")

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

@ -60,9 +60,13 @@ public class FinCollectionConfirmationDto implements Dto {
private String createByName; // 创建人接口
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
@ApiModelProperty("收款银行")
@ApiModelProperty("收款银行key")
private String collectionBankKey; // 收款银行key
@ApiModelProperty("收款银行")
private String collectionBank; // 收款银行
@ApiModelProperty("收款银行账号")
@ApiModelProperty("收款银行账号key")
private String collectionBankNumKey; // 收款银行账号key
@ApiModelProperty("收款银行账号")
private String collectionBankNum; // 收款银行账号
@ApiModelProperty("收款方式key")
private String collectionTypeKey; // 收款方式key

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

@ -0,0 +1,68 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
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;
/**
* Project: anrui-fin(销售相关) <br/>
* File: FinUncollectedReceivablesDetailedVo.java <br/>
* Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo <br/>
* Description: 应收未收款项明细表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "应收未收款项明细", description = "应收未收款项明细")
@Data
public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
@ApiModelProperty("应收未收款项sid")
private String sid; // 应收未收款项sid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车架号")
private String VIN; // 车架号
@ApiModelProperty("联系电话")
private String customerPhone; // 联系电话
@ApiModelProperty("应收项目名称")
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额")
private String currentReceivableMoney; // 当前应收金额
}

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

@ -25,8 +25,6 @@
*********************************************************/
package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -63,7 +61,7 @@ public interface FinUncollectedReceivablesDetailedFeign {
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<FinUncollectedReceivablesDetailedVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query);
public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query);
@ApiOperation("新增或修改保存")
@PostMapping("/saveOrUpdate")

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

@ -49,7 +49,7 @@ import java.util.List;
public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncollectedReceivablesDetailedFeign {
@Override
public ResultBean<List<FinUncollectedReceivablesDetailedVo>> listAll(FinUncollectedReceivablesDetailedQuery query){
public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(FinUncollectedReceivablesDetailedQuery query){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/listAll无法访问");
}

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

@ -52,6 +52,8 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
private String contractNo; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("联系电话")
private String customerPhone; // 联系电话
@ApiModelProperty("款项类型key")
private String paymentTypeKey; // 款项类型key
@ApiModelProperty("应收项目名称")
@ -62,8 +64,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
private String createEndTime; // 生成结束时间
@ApiModelProperty("认款状态")
private String subscriptionState; // 认款状态
@ApiModelProperty("联系电话")
private String customerPhone; // 联系电话
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("业务员sid")

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

@ -41,6 +41,8 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -85,6 +87,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -157,6 +161,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmation.setSid(sid1);
String payFilePath = "";
String remFilePath = "";
String staffSid = dto.getStaffSid();
ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
String orgSidPath = "";
for (SysStaffOrgVo datum : data) {
orgSidPath = datum.getOrgSidPath();
orgSidPath = orgSidPath.substring(0, orgSidPath.indexOf("/"));
}
finCollectionConfirmation.setUseOrgSid(orgSidPath);
for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
payFilePath = commonAppendixDto.getFilePath();

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

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
import org.apache.ibatis.annotations.Mapper;
@ -60,7 +61,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
IPage<FinUncollectedReceivablesDetailedVo> selectPageVo(IPage<FinUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<FinUncollectedReceivablesDetailed> qw);
List<FinUncollectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinUncollectedReceivablesDetailed> qw);
List<DetailsOfReceivablesAndUncollectedItemsVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinUncollectedReceivablesDetailed> qw);
@Select("select * from fin_uncollected_receivables_detailed")
List<FinUncollectedReceivablesDetailedVo> selectListVo();

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

@ -15,9 +15,6 @@
fin_uncollected_receivables_detailed furd <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
SELECT * FROM fin_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchByVinAndRecName"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
@ -39,4 +36,9 @@
WHERE auditState = 3
GROUP BY contractNo,receivablesName
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo">
SELECT * FROM fin_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
</select>
</mapper>

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

@ -26,10 +26,7 @@
package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -64,9 +61,9 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
@Override
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<FinUncollectedReceivablesDetailedVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){
public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){
ResultBean rb = ResultBean.fireFail();
List<FinUncollectedReceivablesDetailedVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
List<DetailsOfReceivablesAndUncollectedItemsVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
return rb.success().setData(list);
}

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

@ -34,10 +34,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -104,7 +101,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
return qw;
}
public List<FinUncollectedReceivablesDetailedVo> listAllVo(FinUncollectedReceivablesDetailedQuery query) {
public List<DetailsOfReceivablesAndUncollectedItemsVo> listAllVo(FinUncollectedReceivablesDetailedQuery query) {
QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}

Loading…
Cancel
Save