diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index bdbe863428..df1323a4b5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -287,7 +287,7 @@ from base_manufacturer where createOrg = #{orgSid} and manBankSid = #{mankSid} - and supplyTypeValue = #{type} + and supplierTypeValue = #{type} AND isDelete = 0 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 69958ae26a..0d14d0914b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -466,6 +466,9 @@ public class BaseManufacturerService extends MybatisBaseService payConfirmFiles; - @ApiModelProperty("付款金额") - private BigDecimal paymentMoney; + @JsonProperty("paymentMoney") + private BigDecimal collectionMoney; @ApiModelProperty("收款日期") private String collectionDate; @ApiModelProperty("付款方名称") - private String paymentName; + @JsonProperty("paymentName") + private String payerName; @ApiModelProperty("收款账号") - private String collectionNum; + @JsonProperty("collectionNum") + private String collectionBankNum; @ApiModelProperty("收款账号key") - private String collectionNumKey; + @JsonProperty("collectionNumKey") + private String collectionBankNumKey; @ApiModelProperty("收款记录sid") + @JsonProperty("collectionBillSid") private String collectionBillSid; - @ApiModelProperty("下载模板") - private String downLoadUrl; - @ApiModelProperty("备注") private String remarks; @ApiModelProperty("收款方式") - private String collectionType; + @JsonProperty("collectionType") + private String collectionTypeValue; @ApiModelProperty("收款方式key") + @JsonProperty("collectionTypeKey") private String collectionTypeKey; - @ApiModelProperty("打款凭证") - private List payFiles; - - @ApiModelProperty("款项明细") - private List paymentDetail; - @ApiModelProperty("余额") private String balance; @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("汇款确认") + private List payConfirmFiles = new ArrayList<>(); + + @ApiModelProperty("打款凭证") + private List payFiles; + + @ApiModelProperty("款项明细") + private List contractList; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java index 9df01da6bc..430399b904 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -20,7 +21,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo { private String collectionBankKey; @ApiModelProperty("汇款确认") - private List payConfirmFiles; + private List payConfirmFiles = new ArrayList<>(); @ApiModelProperty("付款金额") private String paymentMoney; @@ -53,10 +54,10 @@ public class AppFinCollectionConfirmationInitVo implements Vo { private String collectionTypeKey; @ApiModelProperty("打款凭证") - private List payFiles; + private List payFiles = new ArrayList<>(); @ApiModelProperty("款项明细") - private List paymentDetail; + private List contractList = new ArrayList<>(); @ApiModelProperty("余额") private String balance; @@ -65,5 +66,4 @@ public class AppFinCollectionConfirmationInitVo implements Vo { private String userSid; - } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java index 5971e931d1..57e6e520d8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java @@ -1,40 +1,44 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @Data public class AppFinCollectionConfirmationPageVo implements Vo { @ApiModelProperty("确认单sid") - private String collectionBillSid; + private String sid; @ApiModelProperty("收款账号") - private String collectionNum; - @ApiModelProperty("状态") - private int collectionBillState; + private String collectionBankNum; + @ApiModelProperty("审核状态") + private int auditState; @ApiModelProperty("收款银行") private String collectionBank; @ApiModelProperty("收款类型") - private String collectionType; + private String collectionTypeValue; @ApiModelProperty("收款时间") private String collectionDate; - @ApiModelProperty("付款人") - private String paymentName; @ApiModelProperty("收款金额") private String collectionMoney; + @ApiModelProperty("付款人") + private String payerName; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("余额") - private Integer balance; + @ApiModelProperty("认款状态") + private int paymentState; @ApiModelProperty("是否显示办理") private boolean showHandle; @ApiModelProperty("是否显示下载") private boolean showDownload; @ApiModelProperty("是否显示删除") private boolean showDelete; - @ApiModelProperty("认款状态") - private int state; + + @ApiModelProperty("余额") + private BigDecimal balance; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index fb26e201c9..192d6b026b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -19,14 +19,14 @@ diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 38d2d96dbb..321e3cde80 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -321,10 +321,7 @@ public class ScmVehicleGressionService extends MybatisBaseService scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid()); -// int size = vins.size(); -// record.setVinNum(String.valueOf(size)); -// String vin = StringUtils.join(vins, ","); -// record.setVin(vin); + record.setScmVehicleGressionVehs(scmVehicleGressionVehVos); if ("已办结".equals(record.getState())) { diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml index 72c8563d4d..1731237fe6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml +++ b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml @@ -21,6 +21,6 @@ spring: timeout: 0 # 连接超时时间（毫秒） image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/ \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java index d6ca18375b..35d61b4f68 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java @@ -82,7 +82,7 @@ public interface AppFinCollectionConfirmationFeign { @ApiOperation("手机端—查询可使用款项明细列表") @PostMapping("/getPaymentDetailsList") - public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app获取客户账单列表") @PostMapping("/getCustomerBillList") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java index ff40e7df0f..1f8af88230 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java @@ -80,7 +80,7 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti } @Override - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return null; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java index f94197c797..8c6f63a12d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java @@ -1,11 +1,13 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; @Data @@ -22,43 +24,47 @@ public class ConfirmationDto implements Dto { private String collectionBankKey; @ApiModelProperty("汇款确认") - private List payConfirmFiles; + private List payConfirmFiles = new ArrayList<>(); @ApiModelProperty("付款金额") - private BigDecimal paymentMoney; + @JsonProperty("paymentMoney") + private BigDecimal collectionMoney; @ApiModelProperty("收款日期") private String collectionDate; @ApiModelProperty("付款方名称") - private String paymentName; + @JsonProperty("paymentName") + private String payerName; @ApiModelProperty("收款账号") - private String collectionNum; + @JsonProperty("collectionNum") + private String collectionBankNum; @ApiModelProperty("收款账号key") - private String collectionNumKey; + @JsonProperty("collectionNumKey") + private String collectionBankNumKey; @ApiModelProperty("收款记录sid") + @JsonProperty("collectionBillSid") private String collectionBillSid; - @ApiModelProperty("下载模板") - private String downLoadUrl; - @ApiModelProperty("备注") private String remarks; @ApiModelProperty("收款方式") - private String collectionType; + @JsonProperty("collectionType") + private String collectionTypeValue; @ApiModelProperty("收款方式key") + @JsonProperty("collectionTypeKey") private String collectionTypeKey; @ApiModelProperty("打款凭证") private List payFiles; @ApiModelProperty("款项明细") - private List paymentDetail; + private List contractList; @ApiModelProperty("余额") private String balance; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java index ad3398641b..186e557021 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -21,7 +22,7 @@ public class ConfirmationInitVo implements Vo { private String collectionBankKey; @ApiModelProperty("汇款确认") - private List payConfirmFiles; + private List payConfirmFiles = new ArrayList<>(); @ApiModelProperty("付款金额") private String paymentMoney; @@ -54,10 +55,10 @@ public class ConfirmationInitVo implements Vo { private String collectionTypeKey; @ApiModelProperty("打款凭证") - private List payFiles; + private List payFiles = new ArrayList<>() ; @ApiModelProperty("款项明细") - private List paymentDetail; + private List contractList = new ArrayList<>(); @ApiModelProperty("余额") private String balance; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java index 5bb1bccfbc..4b5978a332 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,31 +11,38 @@ public class ConfirmationPageVo implements Vo { private static final long serialVersionUID = -4426699322787264581L; @ApiModelProperty("确认单sid") - private String collectionBillSid; + @JsonProperty("collectionBillSid") + private String sid; @ApiModelProperty("收款账号") - private String collectionNum; - @ApiModelProperty("状态") - private String collectionBillState; + @JsonProperty("collectionNum") + private String collectionBankNum; + + @ApiModelProperty("审核状态") + @JsonProperty("collectionBillState") + private String auditState; + @ApiModelProperty("收款银行") private String collectionBank; @ApiModelProperty("收款类型") - private String collectionType; + @JsonProperty("collectionType") + private String collectionTypeValue; @ApiModelProperty("收款时间") private String collectionDate; - @ApiModelProperty("付款人") - private String paymentName; @ApiModelProperty("收款金额") private String collectionMoney; + @ApiModelProperty("付款人") + @JsonProperty("paymentName") + private String payerName; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("余额") - private Integer balance; + @ApiModelProperty("认款状态") + @JsonProperty("state") + private String paymentState; @ApiModelProperty("是否显示办理") private boolean showHandle; @ApiModelProperty("是否显示下载") private boolean showDownload; @ApiModelProperty("是否显示删除") private boolean showDelete; - @ApiModelProperty("认款状态") - private String state; + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java index 7bee5d1cd6..11b41ab875 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java @@ -131,7 +131,7 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm * @return */ @Override - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java index c904475522..7b89e99b30 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java @@ -27,9 +27,14 @@ package com.yxt.anrui.terminal.biz.finance.collectionConfirm; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery; +import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo; +import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo; import com.yxt.anrui.terminal.api.finance.collectionConfirm.*; +import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -38,6 +43,11 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + /** * Project: anrui-fin(销售相关)
* File: FinCollectionConfirmationService.java
@@ -68,9 +78,12 @@ public class AppFinCollectionConfirmationService { public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> collectionConfirmList = finCollectionConfirmationFeign.getCollectionConfirmList(pq); - PagerVo vo = CoverUtils.selectPagerVo(collectionConfirmList.getData()); - return rb.success().setData(vo); + ResultBean> resultBean = finCollectionConfirmationFeign.getCollectionConfirmList(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ConfirmationPageVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setData(v); } /** @@ -153,8 +166,12 @@ public class AppFinCollectionConfirmationService { * @param pagerQuery * @return */ - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { - return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery); + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> paymentDetailsList = finCollectionConfirmationFeign.getPaymentDetailsList(pq); + PagerVo vo = CoverUtils.selectPagerVo(paymentDetailsList.getData()); + return rb.success().setData(vo); } /** diff --git a/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml b/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml index 43aad4f87c..185ab3b3af 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml +++ b/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml @@ -19,7 +19,7 @@ spring: image: upload: - path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ url: prefix: http://anrui.yyundong.com/upload/