From c05ddf57634572b43869e00d426efe05d2df5077 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 10 六月 2026 08:16:23 +0800
Subject: [PATCH] feat:模版合同加备注、水电房屋租赁执行次数改为合同有效期、合同履约列表新增双方履约、开票新增拟开票数量
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 30 -
platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml | 79 +++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContracQueryDTO.java | 17 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 24 +
platformx-business-finance-biz/src/main/resources/mapper/ContractDelayOutMapper.xml | 23 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java | 3
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 195 +++++++++---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractOutBoundInvoiceVo.java | 14
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java | 3
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 6
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 58 +++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java | 60 ++-
platformx-boot/src/main/resources/application-dev.yml | 5
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceOutBoundVo.java | 7
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java | 187 ++++++++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractDelayOutMapper.java | 11
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractDelayOutService.java | 7
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java | 7
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/DelayOutApprovalDTO.java | 21 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractDelayOutServiceImpl.java | 54 +++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java | 14
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java | 1
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractDelayOut.java | 49 +++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java | 5
27 files changed, 773 insertions(+), 117 deletions(-)
diff --git a/platformx-boot/src/main/resources/application-dev.yml b/platformx-boot/src/main/resources/application-dev.yml
index 4fcc6f6..3aa61c1 100644
--- a/platformx-boot/src/main/resources/application-dev.yml
+++ b/platformx-boot/src/main/resources/application-dev.yml
@@ -37,11 +37,6 @@
swagger:
token-url: ${swagger.gateway}/admin/oauth2/token
-# 鏂囦欢涓婁紶閰嶇疆
-file:
- local:
- base-path: D:\\Users\\platformx\\Downloads\\img
-
#bip 閰嶇疆
bip:
flag: false
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java
index 1b95dd0..fd5687d 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java
@@ -13,6 +13,7 @@
public enum FlowNameEnum {
鍚堝悓瀹℃壒("鍚堝悓瀹℃壒"),
鎺掍骇璁″垝瀹℃壒("鎺掍骇璁″垝瀹℃壒"),
+ 寤舵湡鍑鸿揣瀹℃壒("寤舵湡鍑鸿揣瀹℃壒"),
閿�鍞寕璐﹀鎵�("閿�鍞寕璐﹀鎵�");
private String name;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContracQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContracQueryDTO.java
new file mode 100644
index 0000000..be08520
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContracQueryDTO.java
@@ -0,0 +1,17 @@
+package com.by4cloud.platformx.business.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ContracQueryDTO {
+
+ @Schema(description = "鍚堝悓鍚嶇О")
+ private String contractName;
+
+ @Schema(description = "鐢叉柟鍚嶇О")
+ private String partyA;
+
+ @Schema(description = "鐘舵��")
+ private String contractStatus;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
index 2710888..6cd702a 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -141,6 +141,8 @@
@Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�")
private BigDecimal invoiceNotice;
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ private BigDecimal contractTax;
private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/DelayOutApprovalDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/DelayOutApprovalDTO.java
new file mode 100644
index 0000000..e8f855f
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/DelayOutApprovalDTO.java
@@ -0,0 +1,21 @@
+package com.by4cloud.platformx.business.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class DelayOutApprovalDTO {
+
+ @Schema(description = "鍚堝悓ID")
+ private Long contractId;
+
+ @Schema(description = "寤舵湡澶╂暟")
+ private Integer delayDay;
+
+ @Schema(description = "寤舵湡鍗曟嵁鍚嶇О")
+ private String delayAttNames;
+
+ @Schema(description = "寤舵湡鍗曟嵁璺緞")
+ private String delayAttPaths;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java
index 1f5b4e6..dfcfc79 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.business.dto;
+import com.by4cloud.platformx.business.vo.ContractOutBoundInvoiceVo;
import lombok.Data;
import java.util.List;
@@ -7,6 +8,6 @@
@Data
public class GenInvoiceInfoDTO {
- private List<Long> contractOutBoundIds;
+ private List<ContractOutBoundInvoiceVo> outBoundInvoiceList;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
index ff4f49e..380cb3c 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
@@ -73,6 +73,10 @@
// 鐓ょ偔銆佹湁鑹层�侀粦鑹层�佺數鍔涖�佸叾瀹冦�佹哀鍖栭摑銆佸寲宸ャ�佹按娉ャ�佽埞杩�
+ @Schema(description = "娉ㄥ唽璧勬湰")
+ @Column(columnDefinition = "VARCHAR(128) comment '娉ㄥ唽璧勬湰'")
+ private String registerName;
+
@Schema(description = "寮�鎴烽摱琛�")
@Column(columnDefinition = "VARCHAR(20) comment '寮�鎴烽摱琛�'")
private String bankName;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index 5d792d9..c4de463 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -247,32 +247,8 @@
@Column(columnDefinition = "decimal(10,0) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
private BigDecimal invoiceNotice;
- /**
- * 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
- */
- @Transient
- @TableField(exist = false)
- private String approverName;
- /**
- * 鏍囩殑鐗�
- */
- @Transient
- @TableField(exist = false)
- private List<ContractSubjectMatter> contractSubjectMatterList;
-
-
- /**
- * 鏀舵闃舵
- */
- @Transient
- @TableField(exist = false)
- private List<ContractPaymentSchedule> contractPaymentScheduleList;
-
- /**
- * 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟
- */
- @Transient
- @TableField(exist = false)
- private Long remainingDays;
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ @Column(columnDefinition = "decimal(10,2) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ private BigDecimal contractTax;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractDelayOut.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractDelayOut.java
new file mode 100644
index 0000000..85a59c7
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractDelayOut.java
@@ -0,0 +1,49 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+
+import java.util.Date;
+
+/**
+ * 2026骞�6鏈�9鏃� 13:57:15
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="contract_delay_out",comment = "鍚堝悓寤舵湡鍑鸿揣")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "contract_delay_out")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class ContractDelayOut extends BaseModel<ContractDelayOut> {
+
+ @Schema(description = "鍚堝悓ID")
+ @Column(columnDefinition = "bigint comment '鍚堝悓ID'")
+ private Long contractId;
+
+ @Schema(description = "寤舵湡澶╂暟")
+ @Column(columnDefinition = "int comment '寤舵湡澶╂暟'")
+ private Integer delayDay;
+
+ @Schema(description = "寤舵湡鍗曟嵁鍚嶇О")
+ @Column(columnDefinition="VARCHAR(256) comment '瀹㈠晢鍚嶇О'")
+ private String delayAttNames;
+
+ @Schema(description = "寤舵湡鍗曟嵁璺緞")
+ @Column(columnDefinition="VARCHAR(256) comment '瀹㈠晢鍚嶇О'")
+ private String delayAttPaths;
+
+ @Schema(description = "鎻愪氦璐﹀彿")
+ @Column(columnDefinition="VARCHAR(64) comment '鎻愪氦璐﹀彿'")
+ private String applyName;
+
+ @Schema(description = "鎻愪氦鏃堕棿")
+ @Column(columnDefinition="datetime comment '鎻愪氦鏃堕棿'")
+ private Date applyTime;
+
+ @Schema(description = "鐘舵��")
+ @Column(columnDefinition="char comment '0/瀹℃牳涓� 1/瀹℃牳閫氳繃 2/瀹℃牳涓嶉�氳繃'")
+ private String delayStatus;
+}
\ No newline at end of file
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
index 3573d89..8b7d88d 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractInvoice.java
@@ -58,6 +58,10 @@
@Column(columnDefinition="text comment '鍚堝悓鍑哄簱鍗旾D'")
private String outBoundId;
+ @Schema(description = "鍙戠エ棰勮鍙傛暟")
+ @Column(columnDefinition="text comment '鍙戠エ棰勮鍙傛暟'")
+ private String invoicePreviewParam;
+
@Schema(description = "绾㈠啿鏍囪瘑")
@Column(columnDefinition="char comment '绾㈠啿鏍囪瘑 1/鏄� 0/鍚� 2/瀹℃牳涓� 3/绾㈠啿寰呯‘璁�'")
private String redReversal;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java
index 20a6918..23e92ef 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java
@@ -83,6 +83,11 @@
@Column(columnDefinition = "char default 0 comment '寮�绁ㄧ姸鎬侊紙0-鏈紑绁� 1-寮�绁ㄤ腑 2-宸插紑绁級'")
private String invoiceStatus;
+ @Schema(description = "宸插紑绁ㄦ暟閲�")
+ @Column(columnDefinition="decimal(10,2) comment '宸插紑绁ㄦ暟閲�'")
+ private BigDecimal invoiceNum;
+
+
// //浠ヤ笅寮�绁ㄧ浉鍏�
//
// @Schema(description = "缁撶畻id")
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index 8ed8caf..ceb4980 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -7,6 +7,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -95,6 +96,63 @@
@Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
private Integer execDay;
+ @Schema(description = "鐜")
+ private String environment;
+
+ @Schema(description = "鏍囧噯")
+ private String standard;
+
+ @Schema(description = "璐ㄤ繚鏈� 浣跨敤鏈堟暟")
+ private BigDecimal useMonth;
+
+ @Schema(description = "璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁�")
+ private BigDecimal afterShipMonth;
+
+ @Schema(description = "璐ц繍鏂瑰紡")
+ private String shipMethod;
+
+ @Schema(description = "璐ц繍鍦板潃")
+ private String shipAddress;
+
+ @Schema(description = "鍖呰")
+ private String packaging;
+
+ @Schema(description = "缁翠慨鎴栨崲璐ф湡闄�")
+ private BigDecimal repairPeriod;
+
+ @Schema(description = "缁翠慨鎴栨崲璐� 杩濈害閲�")
+ private BigDecimal repairBreachAmount;
+
+ @Schema(description = "璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟")
+ private BigDecimal goodsShort;
+
+ @Schema(description = "璐х墿鏁伴噺涓嶈冻 杩濈害閲�")
+ private BigDecimal goodsShortBreachAmount;
+
+ @Schema(description = "姣忛�炬湡涓�鏃ワ紝鎵挎媴鏈悎鍚屾�婚 杩濈害閲�")
+ private BigDecimal overdueBreachAmount;
+
+ @Schema(description = "閫炬湡 鏃ヤ互涓婄殑锛岀敳鏂规湁鏉冭В闄ゅ悎鍚�")
+ private BigDecimal terminateContract;
+
+ @Schema(description = "鍙屾柟鍧囧彲鍚� 浜烘皯娉曢櫌")
+ private String court;
+
+ @Schema(description = "鏈悎鍚岄檮浠跺寘鎷細")
+ private String contractAttchment;
+
+ @Schema(description = "鍚堝悓绛捐甯�")
+ private String city;
+
+ @Schema(description = "鍚堝悓绛捐鍖�")
+ private String region;
+
+ @Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�")
+ private BigDecimal invoiceNotice;
+
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ private BigDecimal contractTax;
+
private List<ContractPaymentSchedule> contractPaymentSchedule;
private List<ContractSubjectMatter> contractSubjectMatter;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceOutBoundVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceOutBoundVo.java
index 60d039f..a61ab39 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceOutBoundVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceOutBoundVo.java
@@ -21,9 +21,14 @@
private String materialInternalName;
@Schema(description = "鍑哄簱鏁伴噺")
- @Column(columnDefinition="decimal(10,0) comment '鍑哄簱鏁伴噺'")
private BigDecimal outBoundNum;
+ @Schema(description = "寮�绁ㄦ暟閲�")
+ private BigDecimal invoiceNum;
+
+ @Schema(description = "鎷熷紑绁ㄦ暟閲�")
+ private BigDecimal toInvoiceNum;
+
@Schema(description = "鍗曚环")
private BigDecimal unitPrice;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractOutBoundInvoiceVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractOutBoundInvoiceVo.java
new file mode 100644
index 0000000..55cda92
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractOutBoundInvoiceVo.java
@@ -0,0 +1,14 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ContractOutBoundInvoiceVo {
+
+ private String contractOutBoundId;
+
+ private BigDecimal invoiceNum;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java
new file mode 100644
index 0000000..522511c
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java
@@ -0,0 +1,187 @@
+package com.by4cloud.platformx.business.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+@Data
+public class ContractPageVo {
+
+ private Long id;
+
+ @Schema(description = "鍚堝悓缂栧彿")
+ private String contractNo;
+
+ @Schema(description = "鍚堝悓鍚嶇О")
+ private String contractName;
+
+ @Schema(description = "鐢叉柟id")
+ private Long partyAId;
+
+ @Schema(description = "鐢叉柟鍚嶇О")
+ private String partyA;
+
+ @Schema(description = "涔欐柟id")
+ private Long partyBId;
+
+ @Schema(description = "涔欐柟鍚嶇О")
+ private String partyB;
+
+ @Schema(description = "鍚堝悓閲戦")
+ private BigDecimal amount;
+
+ @Schema(description = "甯佺锛圕NY/USD绛夛級")
+ private String currency;
+
+ @Schema(description = "鍚堝悓绫诲瀷锛�0-鐢熸垚寮� 1-澶囨寮忥級")
+ private Integer contractType;
+
+ @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
+ private Integer supplyAttribute;
+
+ @Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
+ @Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鐘舵��'")
+ private Integer contractStatus;
+
+ @Schema(description = "鍚堝悓鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
+ private Integer contractAttribute;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "绛剧讲鏃ユ湡")
+ private Date signDate;
+
+ @Schema(description = "绛捐鍦扮偣")
+ private String signPlace;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鐢熸晥鏃ユ湡")
+ private Date effectiveDate;
+
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ private Integer deliveryCycle;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鍒版湡鏃ユ湡")
+ private Date expirationDate;
+
+ @Schema(description = "鍚堝悓闄勪欢URL")
+ private String attachmentUrl;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍏宠仈鐖跺悎鍚宨d锛堢敤浜庡悎鍚屽彉鏇存椂鎸囧悜鍘熷悎鍚岋級")
+ private Long parentId;
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "瀹℃壒鏃堕棿")
+ private Date approveTime;
+
+ @Schema(description = "鍒拌揣鑺傜偣ID")
+ private Long arrivalScheduleId;
+
+ @Schema(description = "楠屾敹鑺傜偣ID")
+ private Long acceptScheduleId;
+
+ @Schema(description = "erp鎺ㄩ�佹爣璇�")
+ private String erpPushFlag;
+
+ @Schema(description = "寮�绁ㄧ姸鎬�")
+ private String billingStatus;
+
+ @Schema(description = "宸插紑绁ㄩ噾棰�")
+ private BigDecimal billingAmout;
+
+ @Schema(description = "涓嬩竴闃舵")
+ private String nextScheduleName;
+
+ @Schema(description = "妯＄増ID")
+ private Long templateId;
+
+ @Schema(description = "閿�鍞ā寮�")
+ private String salesModel;
+
+ @Schema(description = "宸蹭粯娆鹃噾棰�")
+ private BigDecimal paidAmount;
+
+ @Schema(description = "鍚堝悓鍒嗙被")
+ private String contractCategory;
+
+ @Schema(description = "鎵ц鍛ㄦ湡")
+ private String execFrequency;
+
+ @Schema(description = "鎵ц娆℃暟")
+ private Integer execTimes;
+
+ @Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
+ private Integer execDay;
+
+ @Schema(description = "鐜")
+ private String environment;
+
+ @Schema(description = "鏍囧噯")
+ private String standard;
+
+ @Schema(description = "璐ㄤ繚鏈� 浣跨敤鏈堟暟")
+ private BigDecimal useMonth;
+
+ @Schema(description = "璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁�")
+ private BigDecimal afterShipMonth;
+
+ @Schema(description = "璐ц繍鏂瑰紡")
+ private String shipMethod;
+
+ @Schema(description = "璐ц繍鍦板潃")
+ private String shipAddress;
+
+ @Schema(description = "鍖呰")
+ private String packaging;
+
+ @Schema(description = "缁翠慨鎴栨崲璐ф湡闄�")
+ private BigDecimal repairPeriod;
+
+ @Schema(description = "缁翠慨鎴栨崲璐� 杩濈害閲�")
+ private BigDecimal repairBreachAmount;
+
+ @Schema(description = "璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟")
+ private BigDecimal goodsShort;
+
+ @Schema(description = "璐х墿鏁伴噺涓嶈冻 杩濈害閲�")
+ private BigDecimal goodsShortBreachAmount;
+
+ @Schema(description = "姣忛�炬湡涓�鏃ワ紝鎵挎媴鏈悎鍚屾�婚 杩濈害閲�")
+ private BigDecimal overdueBreachAmount;
+
+ @Schema(description = "閫炬湡 鏃ヤ互涓婄殑锛岀敳鏂规湁鏉冭В闄ゅ悎鍚�")
+ private BigDecimal terminateContract;
+
+ @Schema(description = "鍙屾柟鍧囧彲鍚� 浜烘皯娉曢櫌")
+ private String court;
+
+ @Schema(description = "鏈悎鍚岄檮浠跺寘鎷細")
+ private String contractAttchment;
+
+ @Schema(description = "鍚堝悓绛捐甯�")
+ private String city;
+
+ @Schema(description = "鍚堝悓绛捐鍖�")
+ private String region;
+
+ @Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�")
+ private BigDecimal invoiceNotice;
+
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ private BigDecimal contractTax;
+
+ @Schema(description = "鍑哄簱閲戦")
+ private BigDecimal outAmount;
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index ee1cd03..839212c 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
@@ -55,13 +57,13 @@
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_contract_view')" )
- public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
+ public R getContractPage(@ParameterObject Page page, @ParameterObject ContracQueryDTO queryDTO) {
LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
- wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
- wrapper.eq(ObjUtil.isNotNull(contract.getContractStatus()),Contract::getContractStatus,contract.getContractStatus());
- wrapper.orderByDesc(BaseModel::getCreateTime);
- return R.ok(contractService.pageByScope(page, wrapper));
+// wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
+// wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
+// wrapper.eq(ObjUtil.isNotNull(contract.getContractStatus()),Contract::getContractStatus,contract.getContractStatus());
+// wrapper.orderByDesc(Contract::getCreateTime);
+ return R.ok(contractService.pageScope(page, queryDTO));
}
@@ -228,4 +230,14 @@
public void exportContractYMJCGWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
contractService.exportContractYMJCGWord(id,response);
}
+
+ /**
+ * 寤舵湡鍑鸿揣瀹℃壒
+ */
+
+ @PostMapping("/delayOutApproval")
+ public R delayOutApproval(@RequestBody DelayOutApprovalDTO dto) {
+ return contractService.delayOutApproval(dto);
+ }
+
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java
index 98d59a5..7027835 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java
@@ -1,6 +1,9 @@
package com.by4cloud.platformx.business.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
+import com.by4cloud.platformx.business.entity.ContractDelayOut;
+import com.by4cloud.platformx.business.service.ContractDelayOutService;
import com.by4cloud.platformx.business.service.ContractInvoiceService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.flow.task.constant.TaskStatusEnum;
@@ -28,6 +31,7 @@
private final ContractService contractService;
private final ContractInvoiceService contractInvoiceService;
+ private final ContractDelayOutService delayOutService;
/**
* 寮�濮嬭妭鐐逛簨浠�
@@ -70,6 +74,16 @@
contractInvoiceService.refuseApproval(Long.valueOf(processInstanceParamDto.getParamMap().get("id")+""));
}
}
+ if (processInstanceParamDto.getFlowName().equals(FlowNameEnum.寤舵湡鍑鸿揣瀹℃壒.getName())) {
+ //閫氳繃鍚庢洿鏂颁富琛ㄧ姸鎬�
+ if (processInstanceParamDto.getTaskStatus()== TaskStatusEnum.YJS.getCode()){
+ delayOutService.approvalPass(Long.valueOf(processInstanceParamDto.getParamMap().get("contractId")+""));
+ }
+ //鎷掔粷鍚庡洖閫�涓昏〃鐘舵��
+ if (processInstanceParamDto.getTaskStatus()== TaskStatusEnum.JJ.getCode()){
+ delayOutService.refuseApproval(Long.valueOf(processInstanceParamDto.getParamMap().get("delayOutService")+""));
+ }
+ }
}
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractDelayOutMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractDelayOutMapper.java
new file mode 100644
index 0000000..1698d9e
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractDelayOutMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.business.entity.ContractDelayOut;
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ContractDelayOutMapper extends PlatformxBaseMapper<ContractDelayOut> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
index 8aab02c..9ec6689 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.business.vo.*;
@@ -59,4 +60,6 @@
,@Param("compIds")List<Long> compIds,@Param("smjCompId") Long smj,
@Param("sgbCompId")Long sgb, @Param("jxcCompId")Long jxc,
@Param("tfCompId") Long tfgs,@Param("ymjCompId") Long ymj);
+
+ Page<ContractPageVo> pageScope(Page page,@Param("queryDTO") ContracQueryDTO queryDTO, DataScope comp_id);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractDelayOutService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractDelayOutService.java
new file mode 100644
index 0000000..6d6dce6
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractDelayOutService.java
@@ -0,0 +1,7 @@
+package com.by4cloud.platformx.business.service;
+
+public interface ContractDelayOutService {
+ void approvalPass(Long contractId);
+
+ void refuseApproval(Long contractId);
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
index 2c0a3b0..c879e9a 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
@@ -1,8 +1,11 @@
package com.by4cloud.platformx.business.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
@@ -44,4 +47,8 @@
void exportContractYMJGKCPMMWord(Long id, HttpServletResponse response);
void exportContractYMJCGWord(Long id, HttpServletResponse response);
+
+ R delayOutApproval(DelayOutApprovalDTO dto);
+
+ Page pageScope(Page page, ContracQueryDTO queryDTO);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractDelayOutServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractDelayOutServiceImpl.java
new file mode 100644
index 0000000..167d897
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractDelayOutServiceImpl.java
@@ -0,0 +1,54 @@
+package com.by4cloud.platformx.business.service.impl;
+
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.business.entity.Contract;
+import com.by4cloud.platformx.business.entity.ContractDelayOut;
+import com.by4cloud.platformx.business.mapper.ContractDelayOutMapper;
+import com.by4cloud.platformx.business.mapper.ContractMapper;
+import com.by4cloud.platformx.business.service.ContractDelayOutService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ContractDelayOutServiceImpl extends ServiceImpl<ContractDelayOutMapper, ContractDelayOut> implements ContractDelayOutService {
+
+ private final ContractMapper contractMapper;
+
+ @Override
+ public void approvalPass(Long contractId) {
+ ContractDelayOut delayOut = baseMapper.selectOne(Wrappers.<ContractDelayOut>lambdaQuery().eq(ContractDelayOut::getContractId,contractId)
+ .eq(ContractDelayOut::getDelayStatus,"0").last("limit 1"));
+ if (ObjUtil.isNull(delayOut)){
+ log.error("鍚堝悓寤舵湡鍙戣揣瀹℃壒鍚屾剰鍚庢煡璇㈠鎵规暟鎹紓甯�");
+ return;
+ }
+ delayOut.setDelayStatus("1");
+ baseMapper.updateById(delayOut);
+ Contract contract = contractMapper.selectById(contractId);
+ if (ObjUtil.isNull(contract)){
+ log.error("鍚堝悓寤舵湡鍙戣揣瀹℃壒鍚屾剰鍚庢煡璇㈠悎鍚屾暟鎹紓甯�");
+ return;
+ }
+ contract.setExpirationDate(DateUtil.offsetDay(contract.getExpirationDate(),delayOut.getDelayDay()));
+ contractMapper.updateById(contract);
+ }
+
+ @Override
+ public void refuseApproval(Long contractId) {
+ ContractDelayOut delayOut = baseMapper.selectOne(Wrappers.<ContractDelayOut>lambdaQuery().eq(ContractDelayOut::getContractId,contractId)
+ .eq(ContractDelayOut::getDelayStatus,"0").last("limit 1"));
+ if (ObjUtil.isNull(delayOut)){
+ log.error("鍚堝悓寤舵湡鍙戣揣瀹℃壒鍚屾剰鍚庢煡璇㈠鎵规暟鎹紓甯�");
+ return;
+ }
+ delayOut.setDelayStatus("2");
+ baseMapper.updateById(delayOut);
+ }
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
index fa9c7b6..328c86d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
@@ -25,10 +25,7 @@
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractInvoiceService;
import com.by4cloud.platformx.business.service.PaymentConfirmService;
-import com.by4cloud.platformx.business.vo.ContractInvoiceOutBoundVo;
-import com.by4cloud.platformx.business.vo.ContractOutBoundMergeVo;
-import com.by4cloud.platformx.business.vo.GenInvoiceInfoVo;
-import com.by4cloud.platformx.business.vo.InvoiceItemVo;
+import com.by4cloud.platformx.business.vo.*;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
@@ -88,15 +85,21 @@
.selectAll(ContractOutBound.class)
.eq(ContractOutBound::getContractId, contractId);
List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractOutBoundMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
+ if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList.toArray())){
+ invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {
+ contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getInvoiceNum()));
+ contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
+ });
+ }
return R.ok(invoiceOutBoundVoList);
}
@Override
public R genInvoiceInfo(GenInvoiceInfoDTO genInvoiceInfoDTO) {
- if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getContractOutBoundIds())) {
+ if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
return R.failed("璇烽�夋嫨寮�绁ㄥ嚭搴撳崟鍚庡啀鎿嶄綔");
}
- ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getContractOutBoundIds().get(0));
+ ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
Contract contract = contractMapper.selectById(outBound.getContractId());
if (ObjUtil.isNull(contract)) {
return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
@@ -125,16 +128,18 @@
List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
List<String> erpCode = new ArrayList<>();
List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
- List<ContractOutBound> outBounds = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
- .in(ContractOutBound::getId, genInvoiceInfoDTO.getContractOutBoundIds()));
- if (ArrayUtil.isNotEmpty(outBounds.toArray())) {
- outBounds.stream().forEach(contractOutBound -> {
+// List<ContractOutBound> outBounds = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
+// .in(ContractOutBound::getId, genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getContractOutBoundId()).collect(Collectors.toList())));
+ if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
+ genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+
if (!ArrayUtil.contains(erpCode.toArray(), contractOutBound.getSubjectMatterCode())) {
erpCode.add(contractOutBound.getSubjectMatterCode());
ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode());
mergeVo.setMaterialInternalName(contractOutBound.getSubjectMatterName());
- mergeVo.setQuantity(contractOutBound.getOutBoundNum());
+ mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
if (ObjUtil.isNotNull(product)) {
@@ -183,10 +188,10 @@
@Override
public R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO) {
- if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getContractOutBoundIds().toArray())) {
+ if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
return R.failed("璇烽�夋嫨寮�绁ㄥ嚭搴撳崟鍚庡啀鎿嶄綔");
}
- ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getContractOutBoundIds().get(0));
+ ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
Contract contract = contractMapper.selectById(outBound.getContractId());
if (ObjUtil.isNull(contract)) {
return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
@@ -198,7 +203,7 @@
SysDept b = r.getData();
GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
//鍙戠エ淇濆瓨
- ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getContractOutBoundIds(), DateUtil.current() + "");
+ ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "");
//鍚姩娴佺▼
ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
Map<String, Object> map = BeanUtil.beanToMap(invoice);
@@ -209,9 +214,10 @@
return R.failed("娴佺▼鍚姩澶辫触");
}
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
- genInvoiceInfoDTO.getContractOutBoundIds().stream().forEach(outBoundId -> {
- ContractOutBound bound = contractOutBoundMapper.selectById(outBoundId);
+ genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ ContractOutBound bound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
bound.setInvoiceStatus("1");
+ bound.setInvoiceNum(bound.getInvoiceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
contractOutBoundMapper.updateById(bound);
});
return R.ok();
@@ -271,7 +277,7 @@
return jsonObject;
}
- private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract, List<Long> outBoundIds, String serialNo) {
+ private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract, List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo) {
ContractInvoice invoice = new ContractInvoice();
invoice.setContractId(contract.getId());
invoice.setInvoiceCategory("1");
@@ -286,9 +292,10 @@
invoice.setInvoicePreview(JSONObject.toJSONString(genInvoiceInfoVo));
invoice.setInvoiceStatus("1");
invoice.setApprovalStatus("0");
- invoice.setOutBoundId(outBoundIds.stream()
- .map(String::valueOf) // 鎴栬�� .map(Object::toString)
+ invoice.setOutBoundId(outBoundInvoiceVoList.stream()
+ .map(item-> String.valueOf(item.getContractOutBoundId())) // 鎴栬�� .map(Object::toString)
.collect(Collectors.joining(",")));
+ invoice.setInvoicePreviewParam(JSONObject.toJSONString(outBoundInvoiceVoList));
baseMapper.insert(invoice);
return invoice;
}
@@ -327,6 +334,7 @@
invoice.setSerialNo(DateUtil.current() + "");
invoice.setBlueInvoiceId(invoiceId);
invoice.setApprovalStatus("0");
+ invoice.setInvoicePreviewParam(blueInvoice.getInvoicePreviewParam());
baseMapper.insert(invoice);
//鍚姩娴佺▼
ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
@@ -625,12 +633,14 @@
contractMapper.updateById(contract);
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
- String[] outBoundIds = blueInvoice.getOutBoundId().split(",");
- Arrays.stream(outBoundIds).forEach(outBoundId -> {
- ContractOutBound bound = contractOutBoundMapper.selectById(outBoundId);
- bound.setInvoiceStatus("0");
- contractOutBoundMapper.updateById(bound);
- });
+ List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()),ContractOutBoundInvoiceVo.class);
+ if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())){
+ outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
+ ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
+ contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
+ contractOutBoundMapper.updateById(contractOutBound);
+ });
+ }
}
invoice.setApprovalStatus("1");
baseMapper.updateById(invoice);
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index bec5082..bf5f56e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -8,19 +8,23 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.admin.api.entity.SysDept;
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.ContractNumberGenerator;
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
import com.deepoove.poi.XWPFTemplate;
@@ -61,9 +65,7 @@
private final RemoteFlowProcessService remoteFlowProcessService;
private final ProductMapper productMapper;
private final RemoteDeptService remoteDeptService;
-
- @Value("${file.local.base-path}")
- private String basePath;
+ private final ContractDelayOutMapper contractDelayOutMapper;
@Override
public R add(ContractAddDTO addDTO) {
@@ -74,8 +76,12 @@
contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
- List<Contract> contracts;
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+
+ if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && (
+ StrUtil.equals(addDTO.getContractCategory(), "ymjgkcpmm")||StrUtil.equals(addDTO.getContractCategory(), "ymjgypmm"))) {
+ contract.setExpirationDate(DateUtil.offsetDay(contract.getSignDate(),contract.getDeliveryCycle()));
+ }
+ List<Contract> contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
while (ArrayUtil.isNotEmpty(contracts.toArray())) {
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
@@ -102,6 +108,12 @@
record.setBusGuestName(contract.getPartyA());
record.setMeterReadTime(new Date());
meterReadRecordMapper.insert(record);
+ }
+ if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
+ &&ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())&&ObjUtil.isNotNull(contract.getExpirationDate())
+ &&DateUtil.compare(contract.getExpirationDate(),subjectMatter.getPlannedDeliveryDate())>0) {
+ contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
+ baseMapper.updateById(contract);
}
});
@@ -144,9 +156,6 @@
}
- if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
-
- }
return R.ok();
}
@@ -267,58 +276,111 @@
if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId,id));
+
if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
subjectMatterList.stream().forEach(contractSubjectMatter -> {
-
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(contract.getSignDate(), contract.getExecDay());
- for (int i = 0; i < contract.getExecTimes(); i++) {
- if (StrUtil.equals(contract.getExecFrequency(), "1")) {
+ if (StrUtil.equals(contract.getExecFrequency(), "1")) {
+ Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
+ DateUtil.endOfWeek(contract.getExpirationDate()), true);
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
Date execDatei = DateUtil.offsetWeek(execDate0, i);
ContractExecDate execDate = new ContractExecDate();
execDate.setContractId(contract.getId());
execDate.setMatterId(contractSubjectMatter.getId());
execDate.setExecDate(execDatei);
execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "2")) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i );
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "3")) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i * 3);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "4")) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i * 6);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "5")) {
- Date execDatei = DateUtil.offsetYear(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
+ if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
}
}
+ if (StrUtil.equals(contract.getExecFrequency(), "2")) {
+ Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
+ DateUtil.endOfMonth(contract.getExpirationDate()), true);
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetMonth(execDate0, i);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ if (StrUtil.equals(contract.getExecFrequency(), "3")) {
+ Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
+ DateUtil.endOfQuarter(contract.getExpirationDate()), true)/3;
+
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getExpirationDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetMonth(execDate0, i*3);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ if (StrUtil.equals(contract.getExecFrequency(), "4")) {
+ Date startDate = contract.getEffectiveDate();
+ Date endDate = contract.getExpirationDate();
+ Integer startMonth = DateUtil.month(contract.getEffectiveDate());
+ Integer endMonth = DateUtil.month(contract.getExpirationDate());
+ if (1<=startMonth&&startMonth<=6){
+ startDate = DateUtil.beginOfYear(startDate);
+ }
+ if (7<=startMonth&&startMonth<=12){
+ startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate),6);
+ }
+ if (1<=endMonth&&endMonth<=6){
+ endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate),-6);
+ }
+ if (7<=endMonth&&endMonth<=12){
+ endDate = DateUtil.endOfYear(endDate);
+ }
+ Long weeksTrue = DateUtil.betweenMonth(startDate,endDate, true)/6;
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getExpirationDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetMonth(execDate0, i*6);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ if (StrUtil.equals(contract.getExecFrequency(), "5")) {
+ Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
+ DateUtil.endOfYear(contract.getExpirationDate()), true);
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetWeek(execDate0, i);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+
});
}
} else {
@@ -972,6 +1034,8 @@
map.put("court",contract.getCourt());
map.put("contractAttchment",contract.getContractAttchment());
map.put("invoiceNotice",contract.getInvoiceNotice());
+ map.put("city",contract.getCity());
+ map.put("region",contract.getRegion());
//鏍囩殑鐗�
List<Map<String, Object>> items = new ArrayList<>();
@@ -1073,4 +1137,35 @@
e.printStackTrace();
}
}
+
+ @Override
+ public R delayOutApproval(DelayOutApprovalDTO dto) {
+ Contract contract = baseMapper.selectById(dto.getContractId());
+ ContractDelayOut delayOut = BeanUtil.copyProperties(dto,ContractDelayOut.class);
+ delayOut.setApplyTime(new Date());
+ delayOut.setApplyName(SecurityUtils.getUser().getUsername());
+ delayOut.setDelayStatus("0");
+ Map<String,Object> map = new HashMap<>();
+ map.put("contractId",contract.getId());
+ map.put("contractName",contract.getContractName());
+ map.put("delayDay",dto.getDelayDay());
+ map.put("applyName",SecurityUtils.getUser().getUsername());
+ map.put("applyTime",DateUtil.format(delayOut.getApplyTime(),DatePattern.NORM_DATETIME_FORMAT));
+ //鍚姩娴佺▼
+ ProcessInstanceParamDto paramDto = new ProcessInstanceParamDto();
+ paramDto.setParamMap(map);
+ paramDto.setFlowName(FlowNameEnum.寤舵湡鍑鸿揣瀹℃壒.name());
+ R r1 = remoteFlowProcessService.startProcessInstance(paramDto);
+ if (r1.getCode() == 1) {
+ return R.failed("娴佺▼鍚姩澶辫触");
+ }
+ contractDelayOutMapper.insert(delayOut);
+ return R.ok();
+ }
+
+ @Override
+ public Page pageScope(Page page, ContracQueryDTO queryDTO) {
+
+ return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 0ea787b..8782f83 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -53,6 +53,7 @@
.in(ContractSubjectMatter::getMaterialCode, addDTO.getSubjectMatterList().stream().map(item -> item.getSubjectMatterCode()).collect(Collectors.toList()))
.exists(Contract.class, contractQuery ->
contractQuery.select(ContractSubjectMatter::getId)
+ .eq(Contract::getContractStatus,2)
.eq(Contract::getId, ContractSubjectMatter::getContractId)
.eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), Contract::getPartyA, addDTO.getBusGuestName())
.eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), Contract::getPartyAId, addDTO.getBusGuestId())
@@ -93,7 +94,7 @@
if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
remainNum = remainNum.subtract(subjectMatter.getRemainingQuantity());
//閮ㄥ垎浜や粯鐘舵�佷笅 鍏ㄩ儴鍑哄簱
- if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
+ if (remainNum.compareTo(new BigDecimal("0")) > 0) {
BigDecimal currentOut = subjectMatter.getRemainingQuantity();
subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
subjectMatter.setRemainingQuantity(new BigDecimal("0"));
@@ -121,7 +122,7 @@
} else {
//鏈氦浠樼姸鎬佷笅
remainNum = remainNum.subtract(subjectMatter.getQuantity());
- if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
+ if (remainNum.compareTo(new BigDecimal("0")) > 0) {
subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
subjectMatter.setRemainingQuantity(new BigDecimal("0"));
subjectMatter.setActualDeliveryDate(DateUtil.today());
@@ -385,6 +386,7 @@
contractOutBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
contractOutBound.setOutBoundId(outBoundId);
contractOutBound.setInvoiceStatus("0");
+ contractOutBound.setInvoiceNum(new BigDecimal("0"));
contractOutBoundMapper.insert(contractOutBound);
if (StrUtil.isEmpty(contract.getContractCategory())){
if (DateUtil.compare(addDTO.getOutBoundTime(),contract.getExpirationDate())>0){
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractDelayOutMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractDelayOutMapper.xml
new file mode 100644
index 0000000..552f4e1
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractDelayOutMapper.xml
@@ -0,0 +1,23 @@
+<?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.by4cloud.platformx.business.mapper.ContractDelayOutMapper">
+
+ <resultMap id="contractOutBoundMap" type="com.by4cloud.platformx.business.entity.ContractDelayOut">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+
+ <result property="contractId" column="contract_id"/>
+ <result property="delayDay" column="contract_name"/>
+ <result property="delayAttNames" column="delay_att_names"/>
+ <result property="delayAttPaths" column="delay_att_paths"/>
+ <result property="applyName" column="apply_name"/>
+ <result property="applyTime" column="apply_time"/>
+ <result property="delayStatus" column="delay_status"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="delFlag" column="del_flag"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
index 765f216..f21b81e 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
@@ -1008,4 +1008,83 @@
b.sales_model
</select>
+ <select id="pageScope" resultType="com.by4cloud.platformx.business.vo.ContractPageVo">
+ SELECT
+ id,
+ contract_no,
+ contract_name,
+ party_a_id,
+ party_a,
+ party_b_id,
+ party_b,
+ amount,
+ currency,
+ contract_type,
+ supply_attribute,
+ contract_status,
+ contract_attribute,
+ sign_date,
+ sign_place,
+ effective_date,
+ delivery_cycle,
+ expiration_date,
+ attachment_url,
+ remark,
+ parent_id,
+ approve_time,
+ arrival_schedule_id,
+ accept_schedule_id,
+ erp_push_flag,
+ billing_status,
+ billing_amout,
+ next_schedule_name,
+ template_id,
+ sales_model,
+ paid_amount,
+ contract_category,
+ exec_frequency,
+ exec_times,
+ exec_day,
+ environment,
+ standard,
+ use_month,
+ after_ship_month,
+ ship_method,
+ ship_address,
+ packaging,
+ repair_period,
+ repair_breach_amount,
+ goods_short,
+ goods_short_breach_amount,
+ overdue_breach_amount,
+ terminate_contract,
+ court,
+ contract_attchment,
+ city,
+ region,
+ invoice_notice,
+ contract_tax,
+ create_by,
+ update_by,
+ create_time,
+ update_time,
+ del_flag,
+ comp_id,
+ (select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = c.id) outAmount
+ FROM
+ contract c
+ WHERE
+ del_flag = '0'
+ <if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
+ AND contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
+ <if test="queryDTO.partyA !=null and queryDTO.partyA !=''">
+ AND party_a LIKE CONCAT('%', #{queryDTO.partyA}, '%')
+ </if>
+ <if test="queryDTO.contractStatus !=null and queryDTO.contractStatus !=''">
+ AND contract_status = #{queryDTO.contractStatus}
+ </if>
+ ORDER BY
+ create_time DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1