diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
index b7b5fb2bdb..3c2428cc54 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -44,7 +44,7 @@
-
+
@@ -81,12 +81,8 @@
- 业务类型
-
-
-
-
-
+ 银行简称
+
备注
@@ -125,8 +121,7 @@ export default {
companyName: '', // 单位名称
bank: '', // 开户行
receivingAccount: '', // 收款银行账号
- businessTypeKey: '', // 业务类型key
- businessTypeValue: '', // 业务类型value
+ bankShortName: '',
remarks: '', // 备注
useOrgSid: '', // 分公司sid
useOrgName: ''
@@ -171,7 +166,7 @@ export default {
params: {
companyCode: '',
companyName: '',
- businessTypeValue: '',
+ bank: '',
orgPath: '',
menuUrl: '',
userSid: ''
@@ -265,7 +260,7 @@ export default {
params: {
companyCode: '',
companyName: '',
- businessTypeValue: '',
+ bank: '',
orgPath: '',
menuUrl: '',
userSid: ''
@@ -326,8 +321,7 @@ export default {
companyName: '', // 单位名称
bank: '', // 开户行
receivingAccount: '', // 收款银行账号
- businessTypeKey: '', // 业务类型key
- businessTypeValue: '', // 业务类型value
+ bankShortName: '',
remarks: '', // 备注
useOrgSid: '', // 分公司sid
useOrgName: ''
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
index ae0d13c1e3..0fc2d9a152 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPayment.java
@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPayment.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPayment
- * Description: 付款信息管理.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理", description = "付款信息管理")
@TableName("fin_payment")
@@ -51,19 +38,17 @@ public class FinPayment extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单位编码")
- private String companyCode; // 单位编码
+ private String companyCode;
@ApiModelProperty("单位名称")
- private String companyName; // 单位名称
+ private String companyName;
@ApiModelProperty("开户行")
- private String bank; // 开户行
+ private String bank;
@ApiModelProperty("收款银行账号")
- private String receivingAccount; // 收款银行账号
- @ApiModelProperty("业务类型key")
- private String businessTypeKey; // 业务类型key
- @ApiModelProperty("业务类型value")
- private String businessTypeValue; // 业务类型value
+ private String receivingAccount;
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("分公司sid")
- private String useOrgSid; // 分公司sid
+ private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
index 3303b5ab1a..277e4b038e 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDetailsVo.java
@@ -25,47 +25,30 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
-
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentVo.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentVo
- * Description: 付款信息管理 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理 视图数据详情", description = "付款信息管理 视图数据详情")
public class FinPaymentDetailsVo implements Vo {
- private String sid; // sid
+ private String sid;
private String remarks;
- @ApiModelProperty("单位编码")
- private String companyCode; // 单位编码
- @ApiModelProperty("单位名称")
- private String companyName; // 单位名称
- @ApiModelProperty("开户行")
- private String bank; // 开户行
- @ApiModelProperty("收款银行账号")
- private String receivingAccount; // 收款银行账号
- @ApiModelProperty("业务类型key")
- private String businessTypeKey; // 业务类型key
- @ApiModelProperty("业务类型value")
- private String businessTypeValue; // 业务类型value
+ @ApiModelProperty("单位编码")
+ private String companyCode;
+ @ApiModelProperty("单位名称")
+ private String companyName;
+ @ApiModelProperty("开户行")
+ private String bank;
+ @ApiModelProperty("收款银行账号")
+ private String receivingAccount;
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("分公司sid")
- private String useOrgSid; // 分公司sid
+ private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
index 0d7ffe37d2..a1127d3b68 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentDto.java
@@ -25,47 +25,30 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
-
import com.yxt.common.core.dto.Dto;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentDto.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentDto
- * Description: 付款信息管理 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理 数据传输对象", description = "付款信息管理 数据传输对象")
public class FinPaymentDto implements Dto {
- private String sid; // sid
+ private String sid;
private String remarks;
@ApiModelProperty("单位编码")
- private String companyCode; // 单位编码
+ private String companyCode;
@ApiModelProperty("单位名称")
- private String companyName; // 单位名称
+ private String companyName;
@ApiModelProperty("开户行")
- private String bank; // 开户行
+ private String bank;
@ApiModelProperty("收款银行账号")
- private String receivingAccount; // 收款银行账号
- @ApiModelProperty("业务类型key")
- private String businessTypeKey; // 业务类型key
- @ApiModelProperty("业务类型value")
- private String businessTypeValue; // 业务类型value
+ private String receivingAccount;
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("分公司sid")
- private String useOrgSid; // 分公司sid
+ private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
index 63789bc85a..74fe94cfcd 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
@@ -35,19 +35,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentFeign.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentFeign
- * Description: 付款信息管理.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "付款信息管理")
@FeignClient(
contextId = "anrui-fin-FinPayment",
@@ -79,4 +66,9 @@ public interface FinPaymentFeign {
@GetMapping("/selectByUseOrgSid")
@ResponseBody
public ResultBean> selectByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
+
+ @ApiOperation("修改平仓款开通日期")
+ @PostMapping("/updateOpenDate")
+ @ResponseBody
+ public ResultBean updateOpenDate(@RequestParam("sid") String sid, @RequestParam("openDate") String openDate);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
index 70f826f69e..d905d0616b 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java
@@ -25,26 +25,11 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
-
import com.yxt.common.core.query.Query;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentQuery.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentQuery
- * Description: 付款信息管理 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理 查询条件", description = "付款信息管理 查询条件")
public class FinPaymentQuery implements Query {
@@ -53,8 +38,8 @@ public class FinPaymentQuery implements Query {
private String companyName;
@ApiModelProperty("收款银行账号")
private String receivingAccount;
- @ApiModelProperty("业务类型value")
- private String businessTypeValue;
+ @ApiModelProperty("开户行")
+ private String bank;
private String userSid;
private String orgPath;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
index 286e120d75..f2fe853473 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java
@@ -25,26 +25,11 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpayment;
-
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentVo.java
- * Class: com.yxt.anrui.fin.api.finpayment.FinPaymentVo
- * Description: 付款信息管理 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款信息管理 视图数据对象", description = "付款信息管理 视图数据对象")
public class FinPaymentVo implements Vo {
@@ -59,8 +44,8 @@ public class FinPaymentVo implements Vo {
private String bank;
@ApiModelProperty("收款银行账号")
private String receivingAccount;
- @ApiModelProperty("业务类型value")
- private String businessTypeValue;
+ @ApiModelProperty("银行简称")
+ private String bankShortName;
@ApiModelProperty("备注")
private String remarks;
}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java
index e817645258..29d8d256af 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelow.java
@@ -26,53 +26,50 @@
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
-/**
- * Project: anrui-fin(付款明细)
- * File: FinPaymentapplyDetailsBelow.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow
- * Description: 付款申请明细-明细.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-12 16:08:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款申请明细-明细", description = "付款申请明细-明细")
@TableName("fin_paymentapply_details_below")
public class FinPaymentapplyDetailsBelow extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("款项名称,数据字典")
+ @ApiModelProperty("款项名称,数据字典")
private String costTitleKey; // 款项名称,数据字典
- @ApiModelProperty("款项名称")
+ @ApiModelProperty("款项名称")
private String costTitleValue; // 款项名称
- @ApiModelProperty("付款方式key")
+ @ApiModelProperty("付款方式key")
private String paymentTypeKey; // 付款方式key
- @ApiModelProperty("付款方式value")
+ @ApiModelProperty("付款方式value")
private String paymentType; // 付款方式value
- @ApiModelProperty("收款单位名称")
+ @ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
- @ApiModelProperty("收款单位sid")
+ @ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
- @ApiModelProperty("开户行")
+ @ApiModelProperty("开户行")
private String bank; // 开户行
- @ApiModelProperty("收款银行账号")
+ @ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
- @ApiModelProperty("付款金额")
+ @ApiModelProperty("付款金额")
private BigDecimal payAccount; // 付款金额
- @ApiModelProperty("付款申请明细sid")
+ @ApiModelProperty("付款申请明细sid")
private String detailSid; // 付款申请明细sid
- @ApiModelProperty("后期是否有平仓付款")
+ @ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款
-
+ @ApiModelProperty("平仓款名称")
+ private String closFundName;
+ @ApiModelProperty("开通日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date openDate;
+ @ApiModelProperty("付款单位sid")
+ private String payCompanySid;
+ @ApiModelProperty("付款单位")
+ private String payCompany;
}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
index 06004a6cf6..890c0ad41f 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDetailsVo.java
@@ -25,30 +25,16 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
-/**
- * Project: anrui-fin(付款明细)
- * File: FinPaymentapplyDetailsBelowVo.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowVo
- * Description: 付款申请明细-明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-12 16:08:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款申请明细-明细 视图数据详情", description = "付款申请明细-明细 视图数据详情")
public class FinPaymentapplyDetailsBelowDetailsVo implements Vo {
@@ -79,6 +65,15 @@ public class FinPaymentapplyDetailsBelowDetailsVo implements Vo {
private String detailSid; // 付款申请明细sid
@ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款
+ @ApiModelProperty("平仓款名称")
+ private String closFundName;
+ @ApiModelProperty("开通日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date openDate;
+ @ApiModelProperty("付款单位sid")
+ private String payCompanySid;
+ @ApiModelProperty("付款单位")
+ private String payCompany;
@ApiModelProperty
private List finPaymentapplyDetailsBelowEveList;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
index 9ba9b38cb2..a6a5d6eafa 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowDto.java
@@ -25,7 +25,7 @@
*********************************************************/
package com.yxt.anrui.fin.api.finpaymentapplydetailsbelow;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import com.yxt.common.core.dto.Dto;
@@ -35,21 +35,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
-/**
- * Project: anrui-fin(付款明细)
- * File: FinPaymentapplyDetailsBelowDto.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto
- * Description: 付款申请明细-明细 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-12 16:08:28
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "付款申请明细-明细 数据传输对象", description = "付款申请明细-明细 数据传输对象")
public class FinPaymentapplyDetailsBelowDto implements Dto {
@@ -58,28 +46,37 @@ public class FinPaymentapplyDetailsBelowDto implements Dto {
@ApiModelProperty("备注")
private String remarks;
- @ApiModelProperty("款项名称,数据字典")
+ @ApiModelProperty("款项名称,数据字典")
private String costTitleKey; // 款项名称,数据字典
- @ApiModelProperty("款项名称")
+ @ApiModelProperty("款项名称")
private String costTitleValue; // 款项名称
- @ApiModelProperty("付款方式key")
+ @ApiModelProperty("付款方式key")
private String paymentTypeKey; // 付款方式key
- @ApiModelProperty("付款方式value")
+ @ApiModelProperty("付款方式value")
private String paymentType; // 付款方式value
- @ApiModelProperty("收款单位名称")
+ @ApiModelProperty("收款单位名称")
private String receiveCompany; // 收款单位名称
- @ApiModelProperty("收款单位sid")
+ @ApiModelProperty("收款单位sid")
private String receiveCompanySid; // 收款单位sid
- @ApiModelProperty("开户行")
+ @ApiModelProperty("开户行")
private String bank; // 开户行
- @ApiModelProperty("收款银行账号")
+ @ApiModelProperty("收款银行账号")
private String receivingAccount; // 收款银行账号
- @ApiModelProperty("付款金额")
+ @ApiModelProperty("付款金额")
private BigDecimal payAccount; // 付款金额
- @ApiModelProperty("付款申请明细sid")
+ @ApiModelProperty("付款申请明细sid")
private String detailSid; // 付款申请明细sid
- @ApiModelProperty("后期是否有平仓付款")
+ @ApiModelProperty("后期是否有平仓付款")
private String isPay; // 后期是否有平仓付款
+ @ApiModelProperty("平仓款名称")
+ private String closFundName;
+ @ApiModelProperty("开通日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date openDate;
+ @ApiModelProperty("付款单位sid")
+ private String payCompanySid;
+ @ApiModelProperty("付款单位")
+ private String payCompany;
@ApiModelProperty
private List finPaymentapplyDetailsBelowEveList;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
index b3025515c0..bf50978df7 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
@@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.fin.biz.finpayment;
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -32,29 +33,13 @@ 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.finpayment.FinPayment;
import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
-/**
- * Project: anrui-fin(付款信息管理)
- * File: FinPaymentFeignFallback.java
- * Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentRest
- * Description: 付款信息管理.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 14:27:54
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "付款信息管理")
@RestController
@RequestMapping("v1/finpayment")
@@ -62,6 +47,8 @@ public class FinPaymentRest implements FinPaymentFeign {
@Autowired
private FinPaymentService finPaymentService;
+ @Autowired
+ private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@@ -103,4 +90,11 @@ public class FinPaymentRest implements FinPaymentFeign {
List voList = finPaymentService.selectByUseOrgSid(useOrgSid);
return rb.success().setData(voList);
}
+
+ @Override
+ public ResultBean updateOpenDate(String sid, String openDate) {
+ ResultBean rb = ResultBean.fireFail();
+ finPaymentapplyDetailsBelowEveService.updateOpenDate(sid,openDate);
+ return rb.success();
+ }
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
index bfcfd54fc8..9c26d57125 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
@@ -28,7 +28,6 @@ package com.yxt.anrui.fin.biz.finpaymentapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.finpaymentapply.*;
import com.yxt.anrui.fin.api.finpaymentapply.flow.*;
-import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -37,22 +36,8 @@ import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import java.util.List;
-/**
- * Project: anrui-fin(财务)
- * File: FinPaymentapplyFeignFallback.java
- * Class: com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyRest
- * Description: fin_paymentapply.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "付款申请")
@RestController
@RequestMapping("v1/finpaymentapply")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
index 18cbad3a52..343bc5e567 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java
@@ -1,6 +1,7 @@
package com.yxt.anrui.fin.biz.finpaymentapplydetails;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -53,6 +55,7 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService finPaymentapplyDetailsBelowList = dto.getFinPaymentapplyDetailsBelowList();
for (FinPaymentapplyDetailsBelowDto finPaymentapplyDetailsBelowDto : finPaymentapplyDetailsBelowList) {
finPaymentapplyDetailsBelowDto.setDetailSid(finPaymentapplyDetails.getSid());
+ finPaymentapplyDetailsBelowDto.setClosFundName(DateUtil.formatDate(new Date()) + dto.getPaymentType() + dto.getBank() + "出票" + new BigDecimal(dto.getPayAccount()).divide(new BigDecimal(10000)) + "万元");
String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto);
List finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList();
for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) {
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
index c576bae76d..7a5f7f9aac 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
@@ -35,22 +35,9 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
-
+import org.apache.ibatis.annotations.Update;
import java.util.List;
-/**
- * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveMapper.java
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveMapper
- * Description: 付款申请明细-明细-平仓.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper {
@@ -58,4 +45,7 @@ public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper selByMainSid(String mainSid);
+
+ @Update("update fin_paymentapply_details_below_eve set openDate = #{openDate} where sid = #{sid}")
+ void updateOpenDate(@Param("sid") String sid,@Param("openDate") String openDate);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
index 583e34d187..ed4c226ce4 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
@@ -224,4 +224,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
+
+ public void updateOpenDate(String sid, String openDate) {
+ baseMapper.updateOpenDate(sid, openDate);
+ }
}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
index 61f3d3f313..1c70152cb1 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
@@ -62,7 +62,12 @@
WHEN 1 THEN '控制成功'
WHEN 2 THEN '控制失败'
WHEN 3 THEN '已解控'
- END AS lockCarState
+ END AS lockCarState,
+ CASE
+ WHEN lrpd.dueDate > lrpd.updateDate or lrpd.updateDate IS NULL THEN '1'
+ WHEN lrpd.dueDate <= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
+ WHEN lrpd.dueDate <= lrpd.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1'
+ END AS nowOverdue
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 92be4cc8a0..69416603ae 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -313,6 +313,11 @@ BEGIN
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 销售订单-待交车累计(销售订单已办结且库存状态为库存和在途的)
+/* --待交车累计总订单台数统计规则:
+1.现车:销售订单总台数-未选车架号台数 2.需采购的销售订单:已选择采购渠道销售订单总台数
+ 3.排产中的销售订单:销售订单总台数。
+ 4.已出库台数+已退车台数。
+待交车累计总订单台数=1+2+3-4*/
/* UPDATE daily_report r
INNER JOIN (select count(bv.id) as scount, bv.useOrgSid, bv.modelSid, bv.modelConfigSid, bo.contractNo
from anrui_base.base_vehicle bv
@@ -352,7 +357,7 @@ BEGIN
and bo.useOrgSid = a.useOrgSid
and bm.modelSid = a.modelSid
and bm.modelConfigSid = a.modelConfigSid
- and bo.contractNo = a.contractNo) as ssscount1,
+ and bo.contractNo = a.contractNo and (bov.linkSid != '' or bov.linkSid != null)) as ssscount1,
(SELECT count(bov.id) AS scount
FROM anrui_base.base_vehicle bv
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
@@ -444,7 +449,7 @@ BEGIN
d.modelSid,
d.modelConfigSid,
d.contractNo
- ) a) b) c
+ ) a) b ) c
group by c.useOrgSid, c.modelSid, c.modelConfigSid
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index 70f42a9457..86edc07208 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -223,6 +223,18 @@ export default {
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ if (this.formobj.list.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+ return
+ }
+ for (var i = 0; i < this.formobj.list.length; i++) {
+ if (this.formobj.list[i].actualInCount === '' ) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为空' })
+ return
+ } else if (parseFloat(this.formobj.list[i].actualInCount) < 1) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为零' })
+ }
+ }
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
@@ -245,14 +257,11 @@ export default {
return
}
for (var i = 0; i < this.formobj.list.length; i++) {
- var item = this.formobj.list[i]
- if (item.actualInCount == 0) {
- this.$message({
- showClose: true,
- type: 'error',
- message: '实收数量不能为空'
- })
+ if (this.formobj.list[i].actualInCount === '' ) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为空' })
return
+ } else if (parseFloat(this.formobj.list[i].actualInCount) < 1) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为零' })
}
}
this.submitdisabled = true