From 145580fd820bb31334f2e71643413e846b7ce904 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 30 十月 2026 15:53:20 +0800
Subject: [PATCH] feat:统计内容1-8页

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOutBoundQueryDTO.java                  |    2 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/YszkwcqkVo.java                                 |   24 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java                          |    3 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java            |   14 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ZBJTStatisticController.java            |  113 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SnqqwcqkVo.java                                 |   28 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java                |   11 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkItemVo.java                           |   16 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java |   25 
 platformx-business-finance-biz/src/main/resources/mapper/HistoryOverdueMapper.xml                                               | 1274 ++++++----
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ZBJTStatisticDTO.java                          |   10 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java                         |   12 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanKeyServiceImpl.java         |   52 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanServiceImpl.java            |   18 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java              |   13 
 platformx-business-finance-biz/src/main/resources/mapper/PaymentReceiveMapper.xml                                               |  368 ++
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkVo.java                               |   27 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualPlanKeyController.java            |  122 +
 platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml                                        |  191 +
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualPlanKeyService.java                  |   11 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/HistoryOverdueMapper.java                   |   10 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/AnnualPlanTotalVo.java                          |   54 
 platformx-business-finance-biz/src/main/resources/mapper/AnnualTargetMapper.xml                                                 |   29 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SckfzdgzwcqkVo.java                             |   30 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualTarget.java                           |  137 +
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualTargetServiceImpl.java          |   51 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualPlanKeyMapper.java                    |   12 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkVo.java                                |   25 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java                      |    3 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualPlanKey.java                          |  191 +
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutBoundAddDTO.java                            |    3 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractOutBoundMapper.java                 |   12 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java               |    1 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java             | 1194 ++++++---
 platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml                                                     |  276 ++
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ZBJTStatisticServiceImpl.java         | 1368 +++++++++++
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeZbjtVo.java                                 |   32 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/HomeZbjtDTO.java                               |   10 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ZyxszbwcqkVo.java                               |   28 
 platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml                                                  |  259 ++
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java      |    2 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java                 |    2 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/PjdxcksxywwcqkVo.java                           |   32 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualTargetMapper.java                     |   11 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualTargetService.java                   |   10 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentReceiveMapper.java                   |    6 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java              |   10 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractInvoiceMapper.java                  |   11 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkItemVo.java                            |   24 
 platformx-business-finance-biz/src/main/resources/mapper/AnnualPlanKeyMapper.xml                                                |   32 
 platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml                                              |  642 +++-
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentCreditSale.java                      |   43 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java                                |    5 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeOutBoundVo.java                             |    4 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java                      |    5 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualTargetController.java             |  123 +
 platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml                                             |   42 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ZBJTStatisticService.java                  |   23 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java                       |   16 
 59 files changed, 5,856 insertions(+), 1,246 deletions(-)

diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOutBoundQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOutBoundQueryDTO.java
index 68bb18b..e32fde4 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOutBoundQueryDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOutBoundQueryDTO.java
@@ -8,6 +8,8 @@
 
 	private String contractNo;
 
+	private String contractName;
+
 	@Schema(description = "瀹㈠晢鍚嶇О")
 	private String busGuestName;
 
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/HomeZbjtDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/HomeZbjtDTO.java
new file mode 100644
index 0000000..e9f7b44
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/HomeZbjtDTO.java
@@ -0,0 +1,10 @@
+package com.by4cloud.platformx.business.dto;
+
+import lombok.Data;
+
+@Data
+public class HomeZbjtDTO {
+
+	private String type;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutBoundAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutBoundAddDTO.java
index bad8ca0..9dbc424 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutBoundAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutBoundAddDTO.java
@@ -33,6 +33,9 @@
 	@Schema(description = "鍑哄簱鏂瑰紡 0 erp鎺ㄩ�� 1 鎵嬪姩褰曞叆")
 	private String outBoundType;
 
+	@Schema(description = "鍑哄簱鍗曞彿")
+	private String outBoundCode;
+
 	@Schema(description = "鍑哄簱鏍囩殑鐗�")
 	private List<OutSubjectMatterAddDTO> subjectMatterList;
 
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ZBJTStatisticDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ZBJTStatisticDTO.java
new file mode 100644
index 0000000..0de785d
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ZBJTStatisticDTO.java
@@ -0,0 +1,10 @@
+package com.by4cloud.platformx.business.dto;
+
+import lombok.Data;
+
+@Data
+public class ZBJTStatisticDTO {
+
+	private String yearMonth;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualPlanKey.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualPlanKey.java
new file mode 100644
index 0000000..9f99c4d
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualPlanKey.java
@@ -0,0 +1,191 @@
+package com.by4cloud.platformx.business.entity;
+
+import cn.hutool.core.util.StrUtil;
+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.math.BigDecimal;
+
+/**
+ * 2026骞�10鏈�9鏃� 10:13:52
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="annual_plan_key",comment = "鍗曚綅閲嶇偣宸ヤ綔璁″垝")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "annual_plan_key")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class AnnualPlanKey extends BaseModel<AnnualPlanKey> {
+
+	@Schema(description = "绫诲瀷")
+	@Column(columnDefinition="varchar(2) comment '绫诲瀷'")
+	private String planType;
+
+	@Schema(description = "骞�")
+	@Column(columnDefinition="varchar(12) comment '骞�'")
+	private String planYear;
+
+	@Schema(description = "1鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '1鏈堥噾棰�'")
+	private BigDecimal janAmount;
+
+	@Schema(description = "2鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '2鏈堥噾棰�'")
+	private BigDecimal febAmount;
+
+	@Schema(description = "3鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '3鏈堥噾棰�'")
+	private BigDecimal marAmount;
+
+	@Schema(description = "4鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '4鏈堥噾棰�'")
+	private BigDecimal aprAmount;
+
+	@Schema(description = "5鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '5鏈堥噾棰�'")
+	private BigDecimal mayAmount;
+
+	@Schema(description = "6鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '6鏈堥噾棰�'")
+	private BigDecimal junAmount;
+
+	@Schema(description = "7鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '7鏈堥噾棰�'")
+	private BigDecimal julAmount;
+
+	@Schema(description = "8鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '8鏈堥噾棰�'")
+	private BigDecimal augAmount;
+
+	@Schema(description = "9鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '9鏈堥噾棰�'")
+	private BigDecimal sepAmount;
+
+	@Schema(description = "10鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '10鏈堥噾棰�'")
+	private BigDecimal octAmount;
+
+	@Schema(description = "11鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '11鏈堥噾棰�'")
+	private BigDecimal novAmount;
+
+	@Schema(description = "12鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '12鏈堥噾棰�'")
+	private BigDecimal decAmount;
+
+	public BigDecimal getTotalAmount() {
+		// 浣跨敤 Optional 鎴栦笁鍏冭繍绠楃澶勭悊 null 鍊硷紝闃叉 NullPointerException
+		BigDecimal b1 = janAmount == null ? BigDecimal.ZERO : janAmount;
+		BigDecimal b2 = febAmount == null ? BigDecimal.ZERO : febAmount;
+		BigDecimal b3 = marAmount == null ? BigDecimal.ZERO : marAmount;
+		BigDecimal b4 = aprAmount == null ? BigDecimal.ZERO : aprAmount;
+		BigDecimal b5 = mayAmount == null ? BigDecimal.ZERO : mayAmount;
+		BigDecimal b6 = junAmount == null ? BigDecimal.ZERO : junAmount;
+		BigDecimal b7 = julAmount == null ? BigDecimal.ZERO : julAmount;
+		BigDecimal b8 = augAmount == null ? BigDecimal.ZERO : augAmount;
+		BigDecimal b9 = sepAmount == null ? BigDecimal.ZERO : sepAmount;
+		BigDecimal b10 = octAmount == null ? BigDecimal.ZERO : octAmount;
+		BigDecimal b11 = novAmount == null ? BigDecimal.ZERO : novAmount;
+		BigDecimal b12 = decAmount == null ? BigDecimal.ZERO : decAmount;
+
+		return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10).add(b11).add(b12);
+	}
+
+	public BigDecimal getMonthAmount(String month) {
+		// 浣跨敤 Optional 鎴栦笁鍏冭繍绠楃澶勭悊 null 鍊硷紝闃叉 NullPointerException
+		if (StrUtil.equals("1",month)||StrUtil.equals("01",month)){
+			return janAmount;
+		}
+		if (StrUtil.equals("2",month)||StrUtil.equals("02",month)){
+			return febAmount;
+		}
+		if (StrUtil.equals("3",month)||StrUtil.equals("03",month)){
+			return marAmount;
+		}
+		if (StrUtil.equals("4",month)||StrUtil.equals("04",month)){
+			return aprAmount;
+		}
+		if (StrUtil.equals("5",month)||StrUtil.equals("05",month)){
+			return mayAmount;
+		}
+		if (StrUtil.equals("6",month)||StrUtil.equals("06",month)){
+			return junAmount;
+		}
+		if (StrUtil.equals("7",month)||StrUtil.equals("07",month)){
+			return julAmount;
+		}
+		if (StrUtil.equals("8",month)||StrUtil.equals("08",month)){
+			return augAmount;
+		}
+		if (StrUtil.equals("9",month)||StrUtil.equals("09",month)){
+			return sepAmount;
+		}
+		if (StrUtil.equals("10",month)){
+			return octAmount;
+		}
+		if (StrUtil.equals("11",month)){
+			return novAmount;
+		}
+		if (StrUtil.equals("12",month)){
+			return decAmount;
+		}
+		return new BigDecimal("0");
+	}
+
+	public BigDecimal getToMonTotalAmount(String month) {
+		// 浣跨敤 Optional 鎴栦笁鍏冭繍绠楃澶勭悊 null 鍊硷紝闃叉 NullPointerException
+		BigDecimal b1 = janAmount == null ? BigDecimal.ZERO : janAmount;
+		BigDecimal b2 = febAmount == null ? BigDecimal.ZERO : febAmount;
+		BigDecimal b3 = marAmount == null ? BigDecimal.ZERO : marAmount;
+		BigDecimal b4 = aprAmount == null ? BigDecimal.ZERO : aprAmount;
+		BigDecimal b5 = mayAmount == null ? BigDecimal.ZERO : mayAmount;
+		BigDecimal b6 = junAmount == null ? BigDecimal.ZERO : junAmount;
+		BigDecimal b7 = julAmount == null ? BigDecimal.ZERO : julAmount;
+		BigDecimal b8 = augAmount == null ? BigDecimal.ZERO : augAmount;
+		BigDecimal b9 = sepAmount == null ? BigDecimal.ZERO : sepAmount;
+		BigDecimal b10 = octAmount == null ? BigDecimal.ZERO : octAmount;
+		BigDecimal b11 = novAmount == null ? BigDecimal.ZERO : novAmount;
+		BigDecimal b12 = decAmount == null ? BigDecimal.ZERO : decAmount;
+
+		if (StrUtil.equals("1",month)||StrUtil.equals("01",month)){
+			return b1;
+		}
+		if (StrUtil.equals("2",month)||StrUtil.equals("02",month)){
+			return b1.add(b2);
+		}
+		if (StrUtil.equals("3",month)||StrUtil.equals("03",month)){
+			return b1.add(b2).add(b3);
+		}
+		if (StrUtil.equals("4",month)||StrUtil.equals("04",month)){
+			return b1.add(b2).add(b3).add(b4);
+		}
+		if (StrUtil.equals("5",month)||StrUtil.equals("05",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5);
+		}
+		if (StrUtil.equals("6",month)||StrUtil.equals("06",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6);
+		}
+		if (StrUtil.equals("7",month)||StrUtil.equals("07",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7);
+		}
+		if (StrUtil.equals("8",month)||StrUtil.equals("08",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8);
+		}
+		if (StrUtil.equals("9",month)||StrUtil.equals("09",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9);
+		}
+		if (StrUtil.equals("10",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10);
+		}
+		if (StrUtil.equals("11",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10).add(b11);
+		}
+		if (StrUtil.equals("12",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10).add(b11).add(b12);
+		}
+		return new BigDecimal("0");
+	}
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualTarget.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualTarget.java
new file mode 100644
index 0000000..9dfdb48
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/AnnualTarget.java
@@ -0,0 +1,137 @@
+package com.by4cloud.platformx.business.entity;
+
+import cn.hutool.core.util.StrUtil;
+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.math.BigDecimal;
+
+/**
+ * 2026骞�10鏈�9鏃� 10:13:52
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="annual_target",comment = "鍗曚綅娓呮瑺鎸囨爣")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "annual_target")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class AnnualTarget extends BaseModel<AnnualTarget> {
+
+	@Schema(description = "绫诲瀷")
+	@Column(columnDefinition="char(1) comment '绫诲瀷 1/涓夊勾 2/涓夊勾浠ヤ笂'")
+	private String planType;
+
+	@Schema(description = "骞�")
+	@Column(columnDefinition="varchar(12) comment '骞�'")
+	private String planYear;
+
+	@Schema(description = "1鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '1鏈堥噾棰�'")
+	private BigDecimal janAmount;
+
+	@Schema(description = "2鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '2鏈堥噾棰�'")
+	private BigDecimal febAmount;
+
+	@Schema(description = "3鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '3鏈堥噾棰�'")
+	private BigDecimal marAmount;
+
+	@Schema(description = "4鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '4鏈堥噾棰�'")
+	private BigDecimal aprAmount;
+
+	@Schema(description = "5鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '5鏈堥噾棰�'")
+	private BigDecimal mayAmount;
+
+	@Schema(description = "6鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '6鏈堥噾棰�'")
+	private BigDecimal junAmount;
+
+	@Schema(description = "7鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '7鏈堥噾棰�'")
+	private BigDecimal julAmount;
+
+	@Schema(description = "8鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '8鏈堥噾棰�'")
+	private BigDecimal augAmount;
+
+	@Schema(description = "9鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '9鏈堥噾棰�'")
+	private BigDecimal sepAmount;
+
+	@Schema(description = "10鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '10鏈堥噾棰�'")
+	private BigDecimal octAmount;
+
+	@Schema(description = "11鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '11鏈堥噾棰�'")
+	private BigDecimal novAmount;
+
+	@Schema(description = "12鏈堥噾棰�")
+	@Column(columnDefinition = "decimal(14,2) comment '12鏈堥噾棰�'")
+	private BigDecimal decAmount;
+
+	public BigDecimal getTotalAmount() {
+		// 浣跨敤 Optional 鎴栦笁鍏冭繍绠楃澶勭悊 null 鍊硷紝闃叉 NullPointerException
+		BigDecimal b1 = janAmount == null ? BigDecimal.ZERO : janAmount;
+		BigDecimal b2 = febAmount == null ? BigDecimal.ZERO : febAmount;
+		BigDecimal b3 = marAmount == null ? BigDecimal.ZERO : marAmount;
+		BigDecimal b4 = aprAmount == null ? BigDecimal.ZERO : aprAmount;
+		BigDecimal b5 = mayAmount == null ? BigDecimal.ZERO : mayAmount;
+		BigDecimal b6 = junAmount == null ? BigDecimal.ZERO : junAmount;
+		BigDecimal b7 = julAmount == null ? BigDecimal.ZERO : julAmount;
+		BigDecimal b8 = augAmount == null ? BigDecimal.ZERO : augAmount;
+		BigDecimal b9 = sepAmount == null ? BigDecimal.ZERO : sepAmount;
+		BigDecimal b10 = octAmount == null ? BigDecimal.ZERO : octAmount;
+		BigDecimal b11 = novAmount == null ? BigDecimal.ZERO : novAmount;
+		BigDecimal b12 = decAmount == null ? BigDecimal.ZERO : decAmount;
+
+		return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10).add(b11).add(b12);
+	}
+
+	public BigDecimal getMonthAmount(String month) {
+		// 浣跨敤 Optional 鎴栦笁鍏冭繍绠楃澶勭悊 null 鍊硷紝闃叉 NullPointerException
+		if (StrUtil.equals("1",month)||StrUtil.equals("01",month)){
+			return janAmount;
+		}
+		if (StrUtil.equals("2",month)||StrUtil.equals("02",month)){
+			return febAmount;
+		}
+		if (StrUtil.equals("3",month)||StrUtil.equals("03",month)){
+			return marAmount;
+		}
+		if (StrUtil.equals("4",month)||StrUtil.equals("04",month)){
+			return aprAmount;
+		}
+		if (StrUtil.equals("5",month)||StrUtil.equals("05",month)){
+			return mayAmount;
+		}
+		if (StrUtil.equals("6",month)||StrUtil.equals("06",month)){
+			return junAmount;
+		}
+		if (StrUtil.equals("7",month)||StrUtil.equals("07",month)){
+			return julAmount;
+		}
+		if (StrUtil.equals("8",month)||StrUtil.equals("08",month)){
+			return augAmount;
+		}
+		if (StrUtil.equals("9",month)||StrUtil.equals("09",month)){
+			return sepAmount;
+		}
+		if (StrUtil.equals("10",month)){
+			return octAmount;
+		}
+		if (StrUtil.equals("11",month)){
+			return novAmount;
+		}
+		if (StrUtil.equals("12",month)){
+			return decAmount;
+		}
+		return new BigDecimal("0");
+	}
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java
index 4306f50..75b737e 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java
@@ -33,4 +33,9 @@
 	@Column(columnDefinition="bigint comment '涓婄骇ID'")
 	private Long parentId;
 
+	@Schema(description = "浜у搧鏉垮潡")
+	@Column(columnDefinition = "VARCHAR(64) comment '浜у搧鏉垮潡'")
+	private String productSection;
+
+
 }
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 d92d7d2..7dfb528 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
@@ -95,7 +95,17 @@
 	@Column(columnDefinition="decimal(10,2) DEFAULT 0.00 comment '棰勫紑绁ㄦ暟閲�'")
 	private BigDecimal advanceNum;
 
+	@Schema(description = "浜у搧鏉垮潡")
+	@Column(columnDefinition = "VARCHAR(64) comment '浜у搧鏉垮潡'")
+	private String productSection;
 
+	@Schema(description = "涓氬姟椤圭洰")
+	@Column(columnDefinition = "VARCHAR(64) comment '涓氬姟椤圭洰'")
+	private String businessProject;
+
+	@Schema(description = "浜у搧鍚嶇О")
+	@Column(columnDefinition = "VARCHAR(64) comment '浜у搧鍚嶇О'")
+	private String productCategory;
 //	//浠ヤ笅寮�绁ㄧ浉鍏�
 //
 //	@Schema(description = "缁撶畻id")
@@ -144,7 +154,7 @@
 //	@Column(columnDefinition = "VARCHAR(20) comment '璁¢噺鍗曚綅'")
 //	private String unit;
 //
-//	@Schema(description = "鍗曚环")
-//	@Column(columnDefinition = "decimal(10,2) comment '鍗曚环'")
-//	private BigDecimal unitPrice;
+	@Schema(description = "鍗曚环")
+	@Column(columnDefinition = "decimal(10,2) comment '鍗曚环'")
+	private BigDecimal unitPrice;
 }
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentCreditSale.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentCreditSale.java
new file mode 100644
index 0000000..1b63766
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentCreditSale.java
@@ -0,0 +1,43 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 2026骞�5鏈�22鏃� 08:41:53
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="payment_credit_sale",comment = "姣忔湀璧婇攢")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "payment_credit_sale")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class PaymentCreditSale {
+
+	@Id
+	@TableId(
+			value = "id",
+			type = IdType.ASSIGN_ID
+	)
+	private Long id;
+
+	@Schema(description = "鍗曚綅ID")
+	@Column(columnDefinition="bigint comment '鍗曚綅ID'")
+	private Long compId;
+
+	@Schema(description = "璧婇攢閲戦")
+	@Column(columnDefinition="decimal(14,2) comment '璧婇攢閲戦  /鍏� 涓や綅灏忔暟'")
+	private BigDecimal creditAmount;
+
+	@Schema(description = "璧婇攢鏃ユ湡")
+	@Column(columnDefinition="date comment '璧婇攢鏃ユ湡'")
+	private Date creditDate;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/AnnualPlanTotalVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/AnnualPlanTotalVo.java
index 79e7bc0..6e4c4cf 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/AnnualPlanTotalVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/AnnualPlanTotalVo.java
@@ -104,4 +104,58 @@
 		}
 		return new BigDecimal("0");
 	}
+
+	public BigDecimal getToMonTotalAmount(String month) {
+		// 浣跨敤 Optional 鎴栦笁鍏冭繍绠楃澶勭悊 null 鍊硷紝闃叉 NullPointerException
+		BigDecimal b1 = janAmount == null ? BigDecimal.ZERO : janAmount;
+		BigDecimal b2 = febAmount == null ? BigDecimal.ZERO : febAmount;
+		BigDecimal b3 = marAmount == null ? BigDecimal.ZERO : marAmount;
+		BigDecimal b4 = aprAmount == null ? BigDecimal.ZERO : aprAmount;
+		BigDecimal b5 = mayAmount == null ? BigDecimal.ZERO : mayAmount;
+		BigDecimal b6 = junAmount == null ? BigDecimal.ZERO : junAmount;
+		BigDecimal b7 = julAmount == null ? BigDecimal.ZERO : julAmount;
+		BigDecimal b8 = augAmount == null ? BigDecimal.ZERO : augAmount;
+		BigDecimal b9 = sepAmount == null ? BigDecimal.ZERO : sepAmount;
+		BigDecimal b10 = octAmount == null ? BigDecimal.ZERO : octAmount;
+		BigDecimal b11 = novAmount == null ? BigDecimal.ZERO : novAmount;
+		BigDecimal b12 = decAmount == null ? BigDecimal.ZERO : decAmount;
+
+		if (StrUtil.equals("1",month)||StrUtil.equals("01",month)){
+			return b1;
+		}
+		if (StrUtil.equals("2",month)||StrUtil.equals("02",month)){
+			return b1.add(b2);
+		}
+		if (StrUtil.equals("3",month)||StrUtil.equals("03",month)){
+			return b1.add(b2).add(b3);
+		}
+		if (StrUtil.equals("4",month)||StrUtil.equals("04",month)){
+			return b1.add(b2).add(b3).add(b4);
+		}
+		if (StrUtil.equals("5",month)||StrUtil.equals("05",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5);
+		}
+		if (StrUtil.equals("6",month)||StrUtil.equals("06",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6);
+		}
+		if (StrUtil.equals("7",month)||StrUtil.equals("07",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7);
+		}
+		if (StrUtil.equals("8",month)||StrUtil.equals("08",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8);
+		}
+		if (StrUtil.equals("9",month)||StrUtil.equals("09",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9);
+		}
+		if (StrUtil.equals("10",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10);
+		}
+		if (StrUtil.equals("11",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10).add(b11);
+		}
+		if (StrUtil.equals("12",month)){
+			return b1.add(b2).add(b3).add(b4).add(b5).add(b6).add(b7).add(b8).add(b9).add(b10).add(b11).add(b12);
+		}
+		return new BigDecimal("0");
+	}
 }
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkItemVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkItemVo.java
new file mode 100644
index 0000000..9887c3f
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkItemVo.java
@@ -0,0 +1,16 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CpxssrwcqkItemVo {
+
+	private String xm;
+
+	private BigDecimal xsl;
+
+	private BigDecimal xssr;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkVo.java
new file mode 100644
index 0000000..c8d02d3
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CpxssrwcqkVo.java
@@ -0,0 +1,27 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CpxssrwcqkVo {
+
+	private String xm;
+
+	private BigDecimal dyxsl;
+
+	private BigDecimal dyxssr;
+
+	private BigDecimal ljxsl;
+
+	private BigDecimal ljxssr;
+
+	private BigDecimal qnljxsl;
+
+	private BigDecimal qnljxssr;
+
+	private BigDecimal tqbxsl;
+
+	private BigDecimal tqbxssr;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkItemVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkItemVo.java
new file mode 100644
index 0000000..137adab
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkItemVo.java
@@ -0,0 +1,24 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class GcpbkwcqkItemVo {
+
+	private String dw;
+
+	private String code;
+
+	private String yw;
+
+	private String lb;
+
+	private String xm;
+
+	private String bkmc;
+
+	private BigDecimal wc;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkVo.java
new file mode 100644
index 0000000..f40d171
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GcpbkwcqkVo.java
@@ -0,0 +1,25 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class GcpbkwcqkVo {
+
+	private String xm;
+
+	private String bkmc;
+
+	private BigDecimal dywc;
+
+	private String ytqb;
+
+	private BigDecimal ljwc;
+
+	private String ntqb;
+
+	private String bnzb;
+
+	private String ztqb;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeOutBoundVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeOutBoundVo.java
index baadeb9..7409a18 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeOutBoundVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeOutBoundVo.java
@@ -15,6 +15,8 @@
 
 	private String contractNo;
 
+	private String contractName;
+
 	private String subjectMatterName;
 
 	private String subjectMatterCode;
@@ -27,4 +29,6 @@
 	private BigDecimal unitPrice;
 
 	private BigDecimal invoiceNum;
+
+	private String batchNumber;
 }
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeZbjtVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeZbjtVo.java
index fbd2ab5..dd83a16 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeZbjtVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeZbjtVo.java
@@ -13,11 +13,19 @@
 
 	private BigDecimal sgbbn;
 
+	private BigDecimal sgbqnby;
+
+	private BigDecimal sgbqnbn;
+
 	private BigDecimal smjbr;
 
 	private BigDecimal smjby;
 
 	private BigDecimal smjbn;
+
+	private BigDecimal smjqnby;
+
+	private BigDecimal smjqnbn;
 
 	private BigDecimal jxcbr;
 
@@ -25,17 +33,30 @@
 
 	private BigDecimal jxcbn;
 
+	private BigDecimal jxcqnby;
+
+	private BigDecimal jxcqnbn;
+
 	private BigDecimal tfbr;
 
 	private BigDecimal tfby;
 
 	private BigDecimal tfbn;
 
+	private BigDecimal tfqnby;
+
+	private BigDecimal tfqnbn;
+
 	private BigDecimal ymjbr;
 
 	private BigDecimal ymjby;
 
 	private BigDecimal ymjbn;
+
+	private BigDecimal ymjqnby;
+
+	private BigDecimal ymjqnbn;
+
 
 	/**
 	 * 褰撳墠瀵硅薄鍑忓幓鍙︿竴涓悓绫诲瀷瀵硅薄鐨勬墍鏈� BigDecimal 瀛楁
@@ -152,4 +173,15 @@
 		return val1.add(val2);
 	}
 
+
+	public BigDecimal safeAddAll(BigDecimal sgbbr, BigDecimal smjbr, BigDecimal jxcbr, BigDecimal tfbr, BigDecimal ymjbr) {
+		BigDecimal val1 = sgbbr == null ? BigDecimal.ZERO : sgbbr;
+		BigDecimal val2 = smjbr == null ? BigDecimal.ZERO : smjbr;
+		BigDecimal val3 = jxcbr == null ? BigDecimal.ZERO : jxcbr;
+		BigDecimal val4 = tfbr == null ? BigDecimal.ZERO : tfbr;
+		BigDecimal val5 = ymjbr == null ? BigDecimal.ZERO : ymjbr;
+		return val1.add(val2).add(val3).add(val4).add(val5);
+	}
+
+
 }
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/PjdxcksxywwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/PjdxcksxywwcqkVo.java
new file mode 100644
index 0000000..e92c7fd
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/PjdxcksxywwcqkVo.java
@@ -0,0 +1,32 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PjdxcksxywwcqkVo {
+
+	private String dw;
+
+	private String yw;
+
+	private String lb;
+
+	private BigDecimal qnwc;
+
+	private BigDecimal dywc;
+
+	private String ytqb;
+
+	private BigDecimal ytb;
+
+	private BigDecimal qntq;
+
+	private BigDecimal ljwc;
+
+	private String ljtqb;
+
+	private BigDecimal ljtb;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SckfzdgzwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SckfzdgzwcqkVo.java
new file mode 100644
index 0000000..4c5454d
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SckfzdgzwcqkVo.java
@@ -0,0 +1,30 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SckfzdgzwcqkVo {
+
+	private String dw;
+
+	private String xm;
+
+	private BigDecimal dyjh;
+
+	private BigDecimal dywc;
+
+	private String ywcl;
+
+	private BigDecimal ndjh;
+
+	private BigDecimal ljjh;
+
+	private BigDecimal ljwc;
+
+	private String ljwcl;
+
+	private String ljtb;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SnqqwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SnqqwcqkVo.java
new file mode 100644
index 0000000..cbb3d02
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/SnqqwcqkVo.java
@@ -0,0 +1,28 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SnqqwcqkVo {
+
+	private String xm;
+
+	private String code;
+
+	private String dw;
+
+	private BigDecimal ndzb;
+
+	private BigDecimal dywcqq;
+
+	private BigDecimal dywcqh;
+
+	private BigDecimal ljwcqq;
+
+	private BigDecimal ljwcqh;
+
+	private String zbwcl;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/YszkwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/YszkwcqkVo.java
new file mode 100644
index 0000000..74a391a
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/YszkwcqkVo.java
@@ -0,0 +1,24 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class YszkwcqkVo {
+
+	private String dw;
+
+	private String lb;
+
+	private BigDecimal ysdy;
+
+	private BigDecimal ysqc;
+
+	private BigDecimal qctq;
+
+	private BigDecimal yssy;
+
+	private BigDecimal syhb;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ZyxszbwcqkVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ZyxszbwcqkVo.java
new file mode 100644
index 0000000..e0465a0
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ZyxszbwcqkVo.java
@@ -0,0 +1,28 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ZyxszbwcqkVo {
+
+	private String xm;
+
+	private String dw;
+
+	private BigDecimal drwc;
+
+	private BigDecimal dyjh;
+	private BigDecimal dywc;
+	private String yjhwc;
+	private String ytqb;
+
+	private BigDecimal ndjh;
+
+	private BigDecimal ljjh;
+	private BigDecimal ljwc;
+	private String njhwc;
+	private String ntqb;
+
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualPlanKeyController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualPlanKeyController.java
new file mode 100644
index 0000000..66db2a4
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualPlanKeyController.java
@@ -0,0 +1,122 @@
+package com.by4cloud.platformx.business.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+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.common.core.util.R;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.business.entity.AnnualPlanKey;
+import com.by4cloud.platformx.business.service.AnnualPlanKeyService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 閲嶇偣宸ヤ綔璁″垝
+ *
+ * @author syt
+ * @date 2026-10-29 13:35:43
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/annualPlanKey" )
+@Tag(description = "annualPlanKey" , name = "閲嶇偣宸ヤ綔璁″垝绠$悊" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AnnualPlanKeyController {
+
+    private final  AnnualPlanKeyService annualPlanKeyService;
+
+    /**
+     * 鍒嗛〉鏌ヨ
+     * @param page 鍒嗛〉瀵硅薄
+     * @param annualPlanKey 閲嶇偣宸ヤ綔璁″垝
+     * @return
+     */
+    @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('bueiness_annualPlanKey_view')" )
+    public R getAnnualPlanKeyPage(@ParameterObject Page page, @ParameterObject AnnualPlanKey annualPlanKey) {
+        LambdaQueryWrapper<AnnualPlanKey> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(StrUtil.isNotBlank(annualPlanKey.getPlanYear()),AnnualPlanKey::getPlanYear,annualPlanKey.getPlanYear());
+		wrapper.orderByDesc(AnnualPlanKey::getCreateTime);
+        return R.ok(annualPlanKeyService.pageByScope(page, wrapper));
+    }
+
+
+    /**
+     * 閫氳繃id鏌ヨ閲嶇偣宸ヤ綔璁″垝
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('bueiness_annualPlanKey_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(annualPlanKeyService.getById(id));
+    }
+
+    /**
+     * 鏂板閲嶇偣宸ヤ綔璁″垝
+     * @param annualPlanKey 閲嶇偣宸ヤ綔璁″垝
+     * @return R
+     */
+    @Operation(summary = "鏂板閲嶇偣宸ヤ綔璁″垝" , description = "鏂板閲嶇偣宸ヤ綔璁″垝" )
+    @SysLog("鏂板閲嶇偣宸ヤ綔璁″垝" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('bueiness_annualPlanKey_add')" )
+    public R save(@RequestBody AnnualPlanKey annualPlanKey) {
+        return annualPlanKeyService.add(annualPlanKey);
+    }
+
+    /**
+     * 淇敼閲嶇偣宸ヤ綔璁″垝
+     * @param annualPlanKey 閲嶇偣宸ヤ綔璁″垝
+     * @return R
+     */
+    @Operation(summary = "淇敼閲嶇偣宸ヤ綔璁″垝" , description = "淇敼閲嶇偣宸ヤ綔璁″垝" )
+    @SysLog("淇敼閲嶇偣宸ヤ綔璁″垝" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('bueiness_annualPlanKey_edit')" )
+    public R updateById(@RequestBody AnnualPlanKey annualPlanKey) {
+        return R.ok(annualPlanKeyService.updateById(annualPlanKey));
+    }
+
+    /**
+     * 閫氳繃id鍒犻櫎閲嶇偣宸ヤ綔璁″垝
+     * @param ids id鍒楄〃
+     * @return R
+     */
+    @Operation(summary = "閫氳繃id鍒犻櫎閲嶇偣宸ヤ綔璁″垝" , description = "閫氳繃id鍒犻櫎閲嶇偣宸ヤ綔璁″垝" )
+    @SysLog("閫氳繃id鍒犻櫎閲嶇偣宸ヤ綔璁″垝" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('bueiness_annualPlanKey_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(annualPlanKeyService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 瀵煎嚭excel 琛ㄦ牸
+     * @param annualPlanKey 鏌ヨ鏉′欢
+   	 * @param ids 瀵煎嚭鎸囧畾ID
+     * @return excel 鏂囦欢娴�
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('bueiness_annualPlanKey_export')" )
+    public List<AnnualPlanKey> export(AnnualPlanKey annualPlanKey,Long[] ids) {
+        return annualPlanKeyService.list(Wrappers.lambdaQuery(annualPlanKey).in(ArrayUtil.isNotEmpty(ids), AnnualPlanKey::getId, ids));
+    }
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualTargetController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualTargetController.java
new file mode 100644
index 0000000..10b7813
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/AnnualTargetController.java
@@ -0,0 +1,123 @@
+package com.by4cloud.platformx.business.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+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.entity.AnnualPlanKey;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.business.entity.AnnualTarget;
+import com.by4cloud.platformx.business.service.AnnualTargetService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 娓呮瑺鎸囨爣
+ *
+ * @author syt
+ * @date 2026-10-29 14:51:31
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/annualTarget" )
+@Tag(description = "annualTarget" , name = "娓呮瑺鎸囨爣绠$悊" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AnnualTargetController {
+
+    private final  AnnualTargetService annualTargetService;
+
+    /**
+     * 鍒嗛〉鏌ヨ
+     * @param page 鍒嗛〉瀵硅薄
+     * @param annualTarget 娓呮瑺鎸囨爣
+     * @return
+     */
+    @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('business_annualTarget_view')" )
+    public R getAnnualTargetPage(@ParameterObject Page page, @ParameterObject AnnualTarget annualTarget) {
+        LambdaQueryWrapper<AnnualTarget> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(StrUtil.isNotBlank(annualTarget.getPlanYear()),AnnualTarget::getPlanYear,annualTarget.getPlanYear());
+		wrapper.orderByDesc(AnnualTarget::getCreateTime);
+        return R.ok(annualTargetService.pageByScope(page, wrapper));
+    }
+
+
+    /**
+     * 閫氳繃id鏌ヨ娓呮瑺鎸囨爣
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('business_annualTarget_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(annualTargetService.getById(id));
+    }
+
+    /**
+     * 鏂板娓呮瑺鎸囨爣
+     * @param annualTarget 娓呮瑺鎸囨爣
+     * @return R
+     */
+    @Operation(summary = "鏂板娓呮瑺鎸囨爣" , description = "鏂板娓呮瑺鎸囨爣" )
+    @SysLog("鏂板娓呮瑺鎸囨爣" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('business_annualTarget_add')" )
+    public R save(@RequestBody AnnualTarget annualTarget) {
+        return annualTargetService.add(annualTarget);
+    }
+
+    /**
+     * 淇敼娓呮瑺鎸囨爣
+     * @param annualTarget 娓呮瑺鎸囨爣
+     * @return R
+     */
+    @Operation(summary = "淇敼娓呮瑺鎸囨爣" , description = "淇敼娓呮瑺鎸囨爣" )
+    @SysLog("淇敼娓呮瑺鎸囨爣" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('business_annualTarget_edit')" )
+    public R updateById(@RequestBody AnnualTarget annualTarget) {
+        return R.ok(annualTargetService.updateById(annualTarget));
+    }
+
+    /**
+     * 閫氳繃id鍒犻櫎娓呮瑺鎸囨爣
+     * @param ids id鍒楄〃
+     * @return R
+     */
+    @Operation(summary = "閫氳繃id鍒犻櫎娓呮瑺鎸囨爣" , description = "閫氳繃id鍒犻櫎娓呮瑺鎸囨爣" )
+    @SysLog("閫氳繃id鍒犻櫎娓呮瑺鎸囨爣" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('business_annualTarget_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(annualTargetService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 瀵煎嚭excel 琛ㄦ牸
+     * @param annualTarget 鏌ヨ鏉′欢
+   	 * @param ids 瀵煎嚭鎸囧畾ID
+     * @return excel 鏂囦欢娴�
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('business_annualTarget_export')" )
+    public List<AnnualTarget> export(AnnualTarget annualTarget,Long[] ids) {
+        return annualTargetService.list(Wrappers.lambdaQuery(annualTarget).in(ArrayUtil.isNotEmpty(ids), AnnualTarget::getId, ids));
+    }
+}
\ No newline at end of file
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 c61aef6..b068372 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
@@ -123,7 +123,7 @@
      */
     @Operation(summary = "淇敼鍚堝悓绠$悊" , description = "淇敼鍚堝悓绠$悊" )
     @SysLog("淇敼鍚堝悓绠$悊" )
-    @PutMapping
+    @PostMapping("/edit")
     @PreAuthorize("@pms.hasPermission('business_contract_edit')" )
     public R updateById(@RequestBody ContractUpdateDTO updateDTO) {
         return contractService.edit(updateDTO);
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java
index a8be145..3dfdbb3 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/StatisticController.java
@@ -2,6 +2,7 @@
 
 import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
 import com.by4cloud.platformx.business.dto.HomeQueryDTO;
+import com.by4cloud.platformx.business.dto.HomeZbjtDTO;
 import com.by4cloud.platformx.business.entity.SalesMan;
 import com.by4cloud.platformx.business.service.StatisticService;
 import com.by4cloud.platformx.common.core.util.R;
@@ -186,6 +187,16 @@
 	}
 
 	/**
+	 * 瑁呭闆嗗洟棣栭〉
+	 * @return R
+	 */
+	@PostMapping("/homeZbjtChart")
+	public R homeZbjtChart(@RequestBody HomeZbjtDTO queryDTO) {
+		return statisticService.homeZbjtChart(queryDTO);
+	}
+
+
+	/**
 	 * 瀛愬叕鍙搁椤�
 	 * @return R
 	 */
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ZBJTStatisticController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ZBJTStatisticController.java
new file mode 100644
index 0000000..5ffb226
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ZBJTStatisticController.java
@@ -0,0 +1,113 @@
+package com.by4cloud.platformx.business.controller;
+
+import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
+import com.by4cloud.platformx.business.dto.HomeQueryDTO;
+import com.by4cloud.platformx.business.dto.HomeZbjtDTO;
+import com.by4cloud.platformx.business.dto.ZBJTStatisticDTO;
+import com.by4cloud.platformx.business.service.StatisticService;
+import com.by4cloud.platformx.business.service.ZBJTStatisticService;
+import com.by4cloud.platformx.common.core.util.R;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 缁熻妯″潡
+ *
+ * @author syt
+ * @date 2026骞�5鏈�22鏃� 09:41:29
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/zbjt" )
+@Tag(description = "zbjt" , name = "瑁呭闆嗗洟缁熻妯″潡" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class ZBJTStatisticController {
+
+	private final ZBJTStatisticService zbjtStatisticService;
+
+	/**
+	 * 涓昏閿�鍞寚鏍囧畬鎴愭儏鍐�
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/zyxszbwcqk")
+	public R zyxszbwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.zyxszbwcqk(queryDTO);
+	}
+
+	/**
+	 * 搴旀敹璐︽瀹屾垚鎯呭喌
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/yszkwcqk")
+	public R yszkwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.yszkwcqk(queryDTO);
+	}
+
+	/**
+	 * 鍚勪骇鍝佹澘鍧楀畬鎴愭儏鍐�
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/gcpbkwcqk")
+	public R gcpbkwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.gcpbkwcqk(queryDTO);
+	}
+
+	/**
+	 * 甯傚満寮�鍙戦噸鐐瑰伐浣滃畬鎴愭儏鍐�
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/sckfzdgzwcqk")
+	public R sckfzdgzwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.sckfzdgzwcqk(queryDTO);
+	}
+
+	/**
+	 * 涓夊勾娓呮瑺瀹屾垚鎯呭喌
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/snqqwcqk")
+	public R snqqwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.snqqwcqk(queryDTO);
+	}
+
+	/**
+	 * 閰嶄欢銆佸ぇ淇�佸嚭鍙d笁椤逛笟鍔″畬鎴愭儏鍐�
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/pjdxcksxywwcqk")
+	public R pjdxcksxywwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.pjdxcksxywwcqk(queryDTO);
+	}
+
+	/**
+	 * 浜у搧鏂板鍚堝悓瀹屾垚鎯呭喌
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/cpxzhtwcqk")
+	public R cpxzhtwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.cpxzhtwcqk(queryDTO);
+	}
+
+	/**
+	 * 浜у搧閿�鍞敹鍏ュ畬鎴愭儏鍐�
+	 * @param queryDTO
+	 * @return
+	 */
+	@PostMapping("/cpxssrwcqk")
+	public R cpxssrwcqk(@RequestBody ZBJTStatisticDTO queryDTO){
+		return zbjtStatisticService.cpxssrwcqk(queryDTO);
+	}
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualPlanKeyMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualPlanKeyMapper.java
new file mode 100644
index 0000000..4054fb0
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualPlanKeyMapper.java
@@ -0,0 +1,12 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.business.vo.AnnualPlanTotalVo;
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.business.entity.AnnualPlanKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface AnnualPlanKeyMapper extends PlatformxBaseMapper<AnnualPlanKey> {
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualTargetMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualTargetMapper.java
new file mode 100644
index 0000000..7943a66
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/AnnualTargetMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.business.entity.AnnualTarget;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AnnualTargetMapper extends PlatformxBaseMapper<AnnualTarget> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java
index 4ab17c4..161c4b0 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java
@@ -16,6 +16,9 @@
 	@Select("select  certificate_id, cust_name,legal_person,registration_address,cust_code,country,custclass from mdm_send.mdm_cust_base_info_tra_send WHERE is_deleted = '0' and cust_name = #{companyName}")
 	CustInfoVo selectBaseInfoByCustName(String companyName);
 
+	@Select("select  certificate_id, cust_name,legal_person,registration_address,cust_code,country,custclass from mdm_send.mdm_cust_base_info_tra_send WHERE is_deleted = '0' and certificate_id = #{companyName}")
+	CustInfoVo selectBaseInfoByCertId(String companyName);
+
 	@Select("SELECT mcbats.bank_account,mcbats.bank_name FROM mdm_send.mdm_cust_bank_account_tra_send AS mcbats  WHERE is_deleted = '0' and holder_name = #{companyName}")
 	List<CustBankVo> selectBankByCustName(String companyName);
 
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractInvoiceMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractInvoiceMapper.java
index 6fa6055..3a7d4d4 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractInvoiceMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractInvoiceMapper.java
@@ -10,11 +10,14 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface ContractInvoiceMapper extends PlatformxBaseMapper<ContractInvoice> {
     HomeZbjtVo homeZbjt();
+
+	HomeZbjtVo homeZbjtYearAndMon(@Param("startMon") Date monstart, @Param("endMon") Date endMon, @Param("startYear") Date yearstart, @Param("endYear") Date yearend);
 
     HomeZgsVo homeZgs(@Param("compId") Long compId);
 
@@ -31,4 +34,12 @@
 	List<ZbjtIndicatorTrendVo> zbjtPlanAchieced(@Param("compId")Long compId);
 
 	List<ZbjtIndicatorTrendVo> zbjtPlanAchiecedSmj();
+
+	List<GcpbkwcqkItemVo> pjsxywwcqk(@Param("type") String type,@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	List<GcpbkwcqkItemVo> cksxywwcqk(@Param("type") String type,@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	List<GcpbkwcqkItemVo> dxsxywwcqk(@Param("type") String type,@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+
 }
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 96177cc..f44f9a3 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
@@ -15,6 +15,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -105,4 +106,15 @@
 	List<ZbjtIndicatorTrendVo> zbjtPlanAchiecedSmj();
 
     List<ContractExportExceVO> export(@Param("queryDTO")ContracQueryDTO queryDTO, DataScope comp_id);
+
+    HomeZbjtVo homeZbjtYearAndMon(@Param("startMon") Date monstart,@Param("endMon") Date endMon,@Param("startYear") Date yearstart,@Param("endYear") Date yearend);
+
+	List<GcpbkwcqkItemVo> pjsxywwcqkHT(@Param("type") String type,@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	List<GcpbkwcqkItemVo> cksxywwcqkHT(@Param("type") String type,@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	List<GcpbkwcqkItemVo> dxsxywwcqkHT(@Param("type") String type,@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	@Select(" select syr from a_smj_ht where id = 1")
+    String selectYZSH();
 }
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractOutBoundMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractOutBoundMapper.java
index c59901e..a9d0849 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractOutBoundMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractOutBoundMapper.java
@@ -3,14 +3,15 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.business.dto.ContractOutBoundQueryDTO;
 import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
-import com.by4cloud.platformx.business.vo.HomeOutBoundVo;
-import com.by4cloud.platformx.business.vo.HomeZbjtVo;
-import com.by4cloud.platformx.business.vo.HomeZgsVo;
+import com.by4cloud.platformx.business.vo.*;
 import com.by4cloud.platformx.common.data.datascope.DataScope;
 import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
 import com.by4cloud.platformx.business.entity.ContractOutBound;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 @Mapper
 public interface ContractOutBoundMapper extends PlatformxBaseMapper<ContractOutBound> {
@@ -27,4 +28,9 @@
     Page<HomeOutBoundVo> pageScope(Page page, @Param("queryDTO") ContractOutBoundQueryDTO queryDTO, DataScope comp_id);
 
     Page<HomeOutBoundVo> pageByCredit(Page page,@Param("queryDTO")  CreditSalesQueryDTO queryDTO, DataScope comp_id);
+
+    List<GcpbkwcqkItemVo> gcpbkwcqk(@Param("start") Date monstart,@Param("end")  Date monend);
+
+	List<CpxssrwcqkItemVo> cpxssrwcqk(@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java
index 2902ba0..42ea5eb 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java
@@ -1,11 +1,25 @@
 package com.by4cloud.platformx.business.mapper;
 
 import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+import com.by4cloud.platformx.business.vo.CpxssrwcqkItemVo;
+import com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo;
 import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 @Mapper
 public interface ContractSubjectMatterMapper extends PlatformxBaseMapper<ContractSubjectMatter> {
 
 
+    List<GcpbkwcqkItemVo> gcpbkwcqk(@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	List<GcpbkwcqkItemVo> gcpbkwcqkBySK(@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+	List<GcpbkwcqkItemVo> sckfzdgzwcqk(@Param("monstart") Date monstart,@Param("monend")  Date monend);
+
+
+	List<CpxssrwcqkItemVo> cpxzhtwcqk(@Param("monstart") Date monstart,@Param("monend")  Date monend);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/HistoryOverdueMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/HistoryOverdueMapper.java
index e834a3e..392cf42 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/HistoryOverdueMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/HistoryOverdueMapper.java
@@ -3,15 +3,15 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.business.dto.HistoryOverdueQueryDTO;
 import com.by4cloud.platformx.business.dto.HomeQueryDTO;
-import com.by4cloud.platformx.business.vo.HomeOverdueStaVo;
-import com.by4cloud.platformx.business.vo.HomeOverdueVo;
-import com.by4cloud.platformx.business.vo.HomeZbjtVo;
-import com.by4cloud.platformx.business.vo.HomeZgsVo;
+import com.by4cloud.platformx.business.vo.*;
 import com.by4cloud.platformx.common.data.datascope.DataScope;
 import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
 import com.by4cloud.platformx.business.entity.HistoryOverdue;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 @Mapper
 public interface HistoryOverdueMapper extends PlatformxBaseMapper<HistoryOverdue> {
@@ -24,4 +24,6 @@
     HomeOverdueStaVo selectHistoryOverdue(@Param("queryDTO")HomeQueryDTO queryDTO);
 
 	Page<HomeOverdueVo> pageScope(Page page, @Param("queryDTO") HistoryOverdueQueryDTO queryDTO, DataScope comp_id);
+
+    List<SnqqwcqkVo> snqqwcqk(@Param("monstart") Date monstart,@Param("monend")  Date monend,@Param("yearstart")  Date yearstart,@Param("yearend")  Date yearend);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentReceiveMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentReceiveMapper.java
index 2b77833..8f0b7cc 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentReceiveMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentReceiveMapper.java
@@ -1,12 +1,14 @@
 package com.by4cloud.platformx.business.mapper;
 
 import com.by4cloud.platformx.business.entity.PaymentReceive;
+import com.by4cloud.platformx.business.vo.YszkwcqkVo;
 import com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo;
 import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -20,4 +22,8 @@
 	List<ZbjtIndicatorTrendVo> zbjtReceiveScale(@Param("compId") Long compId);
 
 	List<ZbjtIndicatorTrendVo> zbjtReceiveScaleSMJ();
+
+	List<YszkwcqkVo> yszkwcqk(@Param("monstart") Date monstart,@Param("monend")  Date monend,@Param("yearstart")  Date yearstart,
+							  @Param("yearend")  Date yearend,@Param("monstartLastMon")  Date monstartLastMon,
+							  @Param("monendLastMon") Date  monendLastMon);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java
index ba0503b..7d9fb27 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -29,4 +30,8 @@
 	List<ZbjtIndicatorTrendVo> zbjtPlanAchieced(@Param("compId")Long compId);
 
 	List<ZbjtIndicatorTrendVo> zbjtPlanAchiecedSmj();
+
+	HomeZbjtVo homeZbjtYearAndMon(@Param("startMon") Date monstart,@Param("endMon") Date endMon,@Param("startYear") Date yearstart,
+								  @Param("endYear") Date yearend,@Param("startMonLastYear") Date monstartLastYear,@Param("endMonLastYear") Date endMonLastYear,
+								  @Param("startYearLastYear") Date yearstartLastYear,@Param("endYearLastYear") Date endYearLastYear);
 }
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualPlanKeyService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualPlanKeyService.java
new file mode 100644
index 0000000..6803db6
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualPlanKeyService.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.service;
+
+import com.by4cloud.platformx.business.entity.AnnualPlanKey;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.IIService;
+
+public interface AnnualPlanKeyService extends IIService<AnnualPlanKey> {
+
+
+	R add(AnnualPlanKey annualPlanKey);
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualTargetService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualTargetService.java
new file mode 100644
index 0000000..92e5f10
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/AnnualTargetService.java
@@ -0,0 +1,10 @@
+package com.by4cloud.platformx.business.service;
+
+import com.by4cloud.platformx.business.entity.AnnualTarget;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.IIService;
+
+public interface AnnualTargetService extends IIService<AnnualTarget> {
+
+	R add(AnnualTarget annualTarget);
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java
index 077d3f4..c002cfc 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/StatisticService.java
@@ -2,6 +2,7 @@
 
 import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
 import com.by4cloud.platformx.business.dto.HomeQueryDTO;
+import com.by4cloud.platformx.business.dto.HomeZbjtDTO;
 import com.by4cloud.platformx.common.core.util.R;
 
 public interface StatisticService {
@@ -66,4 +67,6 @@
 	R zbjtPlanAchieced();
 
 	R zbjtReceiveScale();
+
+	R homeZbjtChart(HomeZbjtDTO queryDTO);
 }
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ZBJTStatisticService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ZBJTStatisticService.java
new file mode 100644
index 0000000..b4113ee
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ZBJTStatisticService.java
@@ -0,0 +1,23 @@
+package com.by4cloud.platformx.business.service;
+
+import com.by4cloud.platformx.business.dto.ZBJTStatisticDTO;
+import com.by4cloud.platformx.common.core.util.R;
+
+public interface ZBJTStatisticService {
+
+	R zyxszbwcqk(ZBJTStatisticDTO queryDTO);
+
+	R yszkwcqk(ZBJTStatisticDTO queryDTO);
+
+	R gcpbkwcqk(ZBJTStatisticDTO queryDTO);
+
+	R sckfzdgzwcqk(ZBJTStatisticDTO queryDTO);
+
+	R pjdxcksxywwcqk(ZBJTStatisticDTO queryDTO);
+
+	R cpxzhtwcqk(ZBJTStatisticDTO queryDTO);
+
+	R snqqwcqk(ZBJTStatisticDTO queryDTO);
+
+	R cpxssrwcqk(ZBJTStatisticDTO queryDTO);
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanKeyServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanKeyServiceImpl.java
new file mode 100644
index 0000000..28a84aa
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanKeyServiceImpl.java
@@ -0,0 +1,52 @@
+package com.by4cloud.platformx.business.service.impl;
+
+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.AnnualPlan;
+import com.by4cloud.platformx.business.entity.AnnualPlanKey;
+import com.by4cloud.platformx.business.mapper.AnnualPlanKeyMapper;
+import com.by4cloud.platformx.business.service.AnnualPlanKeyService;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+/**
+ * 閲嶇偣宸ヤ綔璁″垝
+ *
+ * @author syt
+ * @date 2026-10-29 13:35:43
+ */
+@Service
+public class AnnualPlanKeyServiceImpl extends ServiceImpl<AnnualPlanKeyMapper, AnnualPlanKey> implements AnnualPlanKeyService {
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
+	@Override
+	public R add(AnnualPlanKey entity) {
+		Long compId = SecurityUtils.getUser().getCompId();
+		if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)
+				|| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc)|| ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+			compId = 2089995177814495234L;
+		}
+		AnnualPlanKey plan = baseMapper.selectOne(Wrappers.<AnnualPlanKey>lambdaQuery().eq(AnnualPlanKey::getPlanYear,entity.getPlanYear())
+				.eq(AnnualPlanKey::getPlanType,entity.getPlanType()).eq(AnnualPlanKey::getCompId, compId)
+				.last("limit 1"));
+		if (ObjUtil.isNotNull(plan)){
+			return R.failed(entity.getPlanYear()+"閲嶇偣宸ヤ綔绫诲瀷宸插瓨鍦�");
+		}
+		baseMapper.insert(entity);
+		return R.ok();
+	}
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanServiceImpl.java
index 6d50f29..089fafd 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualPlanServiceImpl.java
@@ -8,6 +8,7 @@
 import com.by4cloud.platformx.business.service.AnnualPlanService;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 /**
  * 鍗曚綅璁″垝
@@ -18,8 +19,25 @@
 @Service
 public class AnnualPlanServiceImpl extends ServiceImpl<AnnualPlanMapper, AnnualPlan> implements AnnualPlanService {
 
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
 	@Override
 	public R add(AnnualPlan entity) {
+		Long compId = SecurityUtils.getUser().getCompId();
+		if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)
+				|| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc)|| ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+			compId = 2089995177814495234L;
+		}
 		AnnualPlan plan = baseMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery().eq(AnnualPlan::getPlanYear,entity.getPlanYear())
 				.eq(AnnualPlan::getPlanType,entity.getPlanType()).eq(AnnualPlan::getCompId, SecurityUtils.getUser().getCompId())
 				.last("limit 1"));
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualTargetServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualTargetServiceImpl.java
new file mode 100644
index 0000000..5c38702
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/AnnualTargetServiceImpl.java
@@ -0,0 +1,51 @@
+package com.by4cloud.platformx.business.service.impl;
+
+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.AnnualPlan;
+import com.by4cloud.platformx.business.entity.AnnualTarget;
+import com.by4cloud.platformx.business.mapper.AnnualTargetMapper;
+import com.by4cloud.platformx.business.service.AnnualTargetService;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+/**
+ * 娓呮瑺鎸囨爣
+ *
+ * @author syt
+ * @date 2026-10-29 14:51:31
+ */
+@Service
+public class AnnualTargetServiceImpl extends ServiceImpl<AnnualTargetMapper, AnnualTarget> implements AnnualTargetService {
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
+	@Override
+	public R add(AnnualTarget entity) {
+		Long compId = SecurityUtils.getUser().getCompId();
+		if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)
+				|| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc)|| ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+			compId = 2089995177814495234L;
+		}
+		AnnualTarget plan = baseMapper.selectOne(Wrappers.<AnnualTarget>lambdaQuery().eq(AnnualTarget::getPlanYear,entity.getPlanYear())
+				.eq(AnnualTarget::getPlanType,entity.getPlanType()).eq(AnnualTarget::getCompId, SecurityUtils.getUser().getCompId())
+				.last("limit 1"));
+		if (ObjUtil.isNotNull(plan)){
+			return R.failed(entity.getPlanYear()+"鎸囨爣宸插瓨鍦�");
+		}
+		baseMapper.insert(entity);
+		return R.ok();
+	}
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
index d901caa..39da843 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
@@ -191,7 +191,7 @@
 						.last("limit 1"));
 				if (ObjUtil.isNull(customer)) {
 					customer = BeanUtil.copyProperties(excelVO, BusinessCustomer.class);
-					CustInfoVo custInfo = bipViewMapper.selectBaseInfoByCustName(excelVO.getCompanyName());
+					CustInfoVo custInfo = bipViewMapper.selectBaseInfoByCertId(excelVO.getCreditCode());
 					if (ObjUtil.isNotNull(custInfo)) {
 						customer.setCreditCode(custInfo.getCertificateId());
 						customer.setRegisterName(custInfo.getCustName());
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 bb9ee24..39a96c3 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
@@ -565,7 +565,15 @@
 		requestApply.put("fd_customerName", contract.getPartyA());
 		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
 		requestApply.put("fd_type", "00");
-		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		String bzr =  comp.getBaozhangren();
+		String syr = baseMapper.selectYZSH();
+		if (!StrUtil.equals(contract.getCompId()+"",contract.getPartyBId()+"")&& (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw))&&StrUtil.isNotBlank(syr)) {
+			log.info("鐭崇叅鏈哄瓙鍏徃鐢ㄦ�诲叕鍙稿嵃绔�");
+			bzr =bzr.concat(syr);
+		}
+		requestApply.put("fd_baozhangren", bzr);
 		requestApply.put("fd_summary",contract.getSummary());
 		JSONArray signList = new JSONArray();
 		JSONObject j = new JSONObject();
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
index fe0192c..0f6943e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
@@ -14,14 +14,8 @@
 import com.by4cloud.platformx.admin.api.vo.DeptExcelVO;
 import com.by4cloud.platformx.business.dto.ContractSubjectMatterAddDTO;
 import com.by4cloud.platformx.business.dto.ContractSubjectMatterAnnotateDTO;
-import com.by4cloud.platformx.business.entity.Contract;
-import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
-import com.by4cloud.platformx.business.entity.Product;
-import com.by4cloud.platformx.business.entity.TaxCode;
-import com.by4cloud.platformx.business.mapper.ContractMapper;
-import com.by4cloud.platformx.business.mapper.ContractSubjectMatterMapper;
-import com.by4cloud.platformx.business.mapper.ProductMapper;
-import com.by4cloud.platformx.business.mapper.TaxCodeMapper;
+import com.by4cloud.platformx.business.entity.*;
+import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
 import com.by4cloud.platformx.business.vo.ContractSubjectMatterVo;
 import com.by4cloud.platformx.business.vo.SubjectMatterExcelVO;
@@ -59,6 +53,8 @@
 	private final ProductMapper productMapper;
 
 	private final TaxCodeMapper taxCodeMapper;
+
+	private final BipDictMapper bipDictMapper;
 
 	private final StringRedisTemplate redisTemplate;
 
@@ -388,9 +384,18 @@
 			Long contractId = annotateDTOList.get(0).getContractId();
 			annotateDTOList.stream().forEach(annotateDTO->{
 				ContractSubjectMatter subjectMatter = baseMapper.selectById(annotateDTO.getId());
-				subjectMatter.setProductSection(annotateDTO.getProductSection());
+
 				subjectMatter.setBusinessProject(annotateDTO.getBusinessProject());
-				subjectMatter.setProductCategory(annotateDTO.getProductCategory());
+
+				if (StrUtil.isNotBlank(annotateDTO.getProductCategory())){
+					subjectMatter.setProductCategory(annotateDTO.getProductCategory());
+					BipDict dict = bipDictMapper.selectOne(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictCode,annotateDTO.getProductCategory())
+							.eq(BipDict::getCompId,SecurityUtils.getUser().getCompId()).eq(BipDict::getDictKey,"zb-cpmc").last("limit 1"));
+					if (ObjUtil.isNotNull(dict)){
+						subjectMatter.setProductSection(dict.getProductSection());
+					}
+				}
+
 				baseMapper.updateById(subjectMatter);
 			});
 			List<ContractSubjectMatter> subjectMatterList = baseMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
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 131e904..7752fe4 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
@@ -18,6 +18,7 @@
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -35,6 +36,7 @@
  * @author syt
  * @date 2026-04-29 11:32:05
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class OutBoundServiceImpl extends ServiceImpl<OutBoundMapper, OutBound> implements OutBoundService {
@@ -429,6 +431,7 @@
 		contractOutBound.setLineNo(subjectMatter.getLineNo());
 		contractOutBound.setInvoiceStatus("0");
 		contractOutBound.setInvoiceNum(new BigDecimal("0"));
+		contractOutBound.setUnitPrice(subjectMatter.getUnitPrice());
 		contractOutBoundMapper.insert(contractOutBound);
 		if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
 			// 1. 纭畾鐢ㄤ簬姣旇緝鐨勫熀鍑嗘棩鏈燂紙浼樺厛绾э細璁″垝浜よ揣鏃ユ湡 > 鍚堝悓鍒版湡鏃ユ湡锛�
@@ -859,13 +862,21 @@
 
 	@Override
 	public R addContractOutSgb(OutBoundAddDTO addDTO) {
+		String batchNumber = "";
+
+		if (StrUtil.isNotBlank(addDTO.getOutBoundCode())){
+			batchNumber = addDTO.getOutBoundCode();
+		}else {
+			batchNumber = genBatchNumber();
+		}
+		log.info("鍑哄簱鍗曞彿:{}",batchNumber);
 		//鏍¢獙鍙傛暟
 		R<Contract> r = vailParam(addDTO);
 		if (!r.isOk()) {
 			return r;
 		}
 		Contract contract = r.getData();
-		String batchNumber = genBatchNumber();
+
 		//鍑哄簱
 		handleOutBound(batchNumber,contract, addDTO);
 
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
index 94bc184..1e73e39 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
@@ -224,6 +224,7 @@
 					baseMapper.insert(product);
 				}
 			}
+			return R.ok();
 		}
 		return R.failed("鏁版嵁涓虹┖");
 	}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
index de879af..1d3d727 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
@@ -1,9 +1,11 @@
 package com.by4cloud.platformx.business.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,6 +16,7 @@
 import com.by4cloud.platformx.business.dto.AgingQueryDTO;
 import com.by4cloud.platformx.business.dto.AnalysisCommonDTO;
 import com.by4cloud.platformx.business.dto.HomeQueryDTO;
+import com.by4cloud.platformx.business.dto.HomeZbjtDTO;
 import com.by4cloud.platformx.business.entity.*;
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.StatisticService;
@@ -74,7 +77,7 @@
 		compIds.add(Long.valueOf(tfgs));
 		compIds.add(Long.valueOf(ymj));
 		compIds.add(Long.valueOf(jxc));
-		List<ContractAmountAnalysisVo> contractAmountAnalysisVoList = contractMapper.contractAmountAnalysis(commonDTO,compIds);
+		List<ContractAmountAnalysisVo> contractAmountAnalysisVoList = contractMapper.contractAmountAnalysis(commonDTO, compIds);
 		return R.ok(contractAmountAnalysisVoList);
 	}
 
@@ -92,22 +95,22 @@
 		compIds.add(Long.valueOf(tfgs));
 		compIds.add(Long.valueOf(ymj));
 		compIds.add(Long.valueOf(jxc));
-		List<ContractIncomeAnalysisVo> contractIncomeAnalysisVoList = contractMapper.contractIncomeAnalysis(commonDTO,compIds);
-		if (CollUtil.isNotEmpty(contractIncomeAnalysisVoList)){
+		List<ContractIncomeAnalysisVo> contractIncomeAnalysisVoList = contractMapper.contractIncomeAnalysis(commonDTO, compIds);
+		if (CollUtil.isNotEmpty(contractIncomeAnalysisVoList)) {
 			contractIncomeAnalysisVoList.stream().forEach(contractIncomeAnalysisVo -> {
-				if(StrUtil.equals(contractIncomeAnalysisVo.getCompId(),sgb)){
+				if (StrUtil.equals(contractIncomeAnalysisVo.getCompId(), sgb)) {
 					contractIncomeAnalysisVo.setCompName("鐭冲伐娉�");
 				}
-				if(StrUtil.equals(contractIncomeAnalysisVo.getCompId(),smj)){
+				if (StrUtil.equals(contractIncomeAnalysisVo.getCompId(), smj)) {
 					contractIncomeAnalysisVo.setCompName("鐭崇叅鏈�");
 				}
-				if(StrUtil.equals(contractIncomeAnalysisVo.getCompId(),ymj)){
+				if (StrUtil.equals(contractIncomeAnalysisVo.getCompId(), ymj)) {
 					contractIncomeAnalysisVo.setCompName("涓�鐓ゆ満");
 				}
-				if(StrUtil.equals(contractIncomeAnalysisVo.getCompId(),tfgs)){
+				if (StrUtil.equals(contractIncomeAnalysisVo.getCompId(), tfgs)) {
 					contractIncomeAnalysisVo.setCompName("閫氭柟鍏徃");
 				}
-				if(StrUtil.equals(contractIncomeAnalysisVo.getCompId(),jxc)){
+				if (StrUtil.equals(contractIncomeAnalysisVo.getCompId(), jxc)) {
 					contractIncomeAnalysisVo.setCompName("鏈烘鍘�");
 				}
 			});
@@ -125,7 +128,7 @@
 	public R contractAmountAnalysisByArea(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("company_area");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("鍦板尯瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -141,10 +144,10 @@
 			return analysisAreaVo;
 		}).collect(Collectors.toList());
 		List<ContractIncomeAnalysisAreaVo> statisticList = contractMapper.contractAmountAnalysisByArea(commonDTO
-				,compIds,Long.valueOf(smj),Long.valueOf(sgb),Long.valueOf(jxc),Long.valueOf(tfgs),Long.valueOf(ymj));
-		contractIncomeAnalysisVoList.stream().forEach(vo1->{
-			statisticList.stream().forEach(vo2->{
-				if (StrUtil.equals(vo1.getAreaId(),vo2.getAreaId())){
+				, compIds, Long.valueOf(smj), Long.valueOf(sgb), Long.valueOf(jxc), Long.valueOf(tfgs), Long.valueOf(ymj));
+		contractIncomeAnalysisVoList.stream().forEach(vo1 -> {
+			statisticList.stream().forEach(vo2 -> {
+				if (StrUtil.equals(vo1.getAreaId(), vo2.getAreaId())) {
 					vo1.setJxczb(vo2.getJxczb());
 					vo1.setJxcze(vo2.getJxcze());
 					vo1.setSgbzb(vo2.getSgbzb());
@@ -165,7 +168,7 @@
 	public R contractAmountAnalysisByIndustry(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("industry_sector");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("琛屼笟瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -181,10 +184,10 @@
 			return analysisAreaVo;
 		}).collect(Collectors.toList());
 		List<ContractIncomeAnalysisAreaVo> statisticList = contractMapper.contractAmountAnalysisByIndustry(commonDTO
-				,compIds,Long.valueOf(smj),Long.valueOf(sgb),Long.valueOf(jxc),Long.valueOf(tfgs),Long.valueOf(ymj));
-		contractIncomeAnalysisVoList.stream().forEach(vo1->{
-			statisticList.stream().forEach(vo2->{
-				if (StrUtil.equals(vo1.getAreaId(),vo2.getAreaId())){
+				, compIds, Long.valueOf(smj), Long.valueOf(sgb), Long.valueOf(jxc), Long.valueOf(tfgs), Long.valueOf(ymj));
+		contractIncomeAnalysisVoList.stream().forEach(vo1 -> {
+			statisticList.stream().forEach(vo2 -> {
+				if (StrUtil.equals(vo1.getAreaId(), vo2.getAreaId())) {
 					vo1.setJxczb(vo2.getJxczb());
 					vo1.setJxcze(vo2.getJxcze());
 					vo1.setSgbzb(vo2.getSgbzb());
@@ -205,7 +208,7 @@
 	public R contractAmountAnalysisByMarket(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("market_type");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("甯傚満绫诲瀷瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -221,10 +224,10 @@
 			return analysisAreaVo;
 		}).collect(Collectors.toList());
 		List<ContractIncomeAnalysisAreaVo> statisticList = contractMapper.contractAmountAnalysisByMarket(commonDTO
-				,compIds,Long.valueOf(smj),Long.valueOf(sgb),Long.valueOf(jxc),Long.valueOf(tfgs),Long.valueOf(ymj));
-		contractIncomeAnalysisVoList.stream().forEach(vo1->{
-			statisticList.stream().forEach(vo2->{
-				if (StrUtil.equals(vo1.getAreaId(),vo2.getAreaId())){
+				, compIds, Long.valueOf(smj), Long.valueOf(sgb), Long.valueOf(jxc), Long.valueOf(tfgs), Long.valueOf(ymj));
+		contractIncomeAnalysisVoList.stream().forEach(vo1 -> {
+			statisticList.stream().forEach(vo2 -> {
+				if (StrUtil.equals(vo1.getAreaId(), vo2.getAreaId())) {
 					vo1.setJxczb(vo2.getJxczb());
 					vo1.setJxcze(vo2.getJxcze());
 					vo1.setSgbzb(vo2.getSgbzb());
@@ -245,7 +248,7 @@
 	public R contractAmountAnalysisBySpcBus(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("supply_attribute");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("渚涘簲灞炴�у瓧鍏稿垎绫昏幏鍙栧紓甯�");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -261,10 +264,10 @@
 			return analysisAreaVo;
 		}).collect(Collectors.toList());
 		List<ContractIncomeAnalysisAreaVo> statisticList = contractMapper.contractAmountAnalysisBySpcBus(commonDTO
-				,compIds,Long.valueOf(smj),Long.valueOf(sgb),Long.valueOf(jxc),Long.valueOf(tfgs),Long.valueOf(ymj));
-		contractIncomeAnalysisVoList.stream().forEach(vo1->{
-			statisticList.stream().forEach(vo2->{
-				if (StrUtil.equals(vo1.getAreaId(),vo2.getAreaId())){
+				, compIds, Long.valueOf(smj), Long.valueOf(sgb), Long.valueOf(jxc), Long.valueOf(tfgs), Long.valueOf(ymj));
+		contractIncomeAnalysisVoList.stream().forEach(vo1 -> {
+			statisticList.stream().forEach(vo2 -> {
+				if (StrUtil.equals(vo1.getAreaId(), vo2.getAreaId())) {
 					vo1.setJxczb(vo2.getJxczb());
 					vo1.setJxcze(vo2.getJxcze());
 					vo1.setSgbzb(vo2.getSgbzb());
@@ -285,7 +288,7 @@
 	public R contractAmountAnalysisByExportBus(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("export_attr");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("鍖哄煙瀛楁鑾峰彇寮傚父");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -301,10 +304,10 @@
 			return analysisAreaVo;
 		}).collect(Collectors.toList());
 		List<ContractIncomeAnalysisAreaVo> statisticList = contractMapper.contractAmountAnalysisByExportBus(commonDTO
-				,compIds,Long.valueOf(smj),Long.valueOf(sgb),Long.valueOf(jxc),Long.valueOf(tfgs),Long.valueOf(ymj));
-		contractIncomeAnalysisVoList.stream().forEach(vo1->{
-			statisticList.stream().forEach(vo2->{
-				if (StrUtil.equals(vo1.getAreaId(),vo2.getAreaId())){
+				, compIds, Long.valueOf(smj), Long.valueOf(sgb), Long.valueOf(jxc), Long.valueOf(tfgs), Long.valueOf(ymj));
+		contractIncomeAnalysisVoList.stream().forEach(vo1 -> {
+			statisticList.stream().forEach(vo2 -> {
+				if (StrUtil.equals(vo1.getAreaId(), vo2.getAreaId())) {
 					vo1.setJxczb(vo2.getJxczb());
 					vo1.setJxcze(vo2.getJxcze());
 					vo1.setSgbzb(vo2.getSgbzb());
@@ -326,7 +329,7 @@
 	public R contractAmountAnalysisBySaleModel(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("sales_model");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("閿�鍞ā寮忓瓧鍏稿垎绫昏幏鍙栧紓甯�");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -343,10 +346,10 @@
 		}).collect(Collectors.toList());
 		contractMapper.setSession();
 		List<ContractIncomeAnalysisAreaVo> statisticList = contractMapper.contractAmountAnalysisBySaleModel(commonDTO
-				,compIds,Long.valueOf(smj),Long.valueOf(sgb),Long.valueOf(jxc),Long.valueOf(tfgs),Long.valueOf(ymj));
-		contractIncomeAnalysisVoList.stream().forEach(vo1->{
-			statisticList.stream().forEach(vo2->{
-				if (StrUtil.equals(vo1.getAreaId(),vo2.getAreaId())){
+				, compIds, Long.valueOf(smj), Long.valueOf(sgb), Long.valueOf(jxc), Long.valueOf(tfgs), Long.valueOf(ymj));
+		contractIncomeAnalysisVoList.stream().forEach(vo1 -> {
+			statisticList.stream().forEach(vo2 -> {
+				if (StrUtil.equals(vo1.getAreaId(), vo2.getAreaId())) {
 					vo1.setJxczb(vo2.getJxczb());
 					vo1.setJxcze(vo2.getJxcze());
 					vo1.setSgbzb(vo2.getSgbzb());
@@ -367,7 +370,7 @@
 	public R agingAnalysisByArea(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("company_area");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("鍦板尯瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 //		List<AgingCompanyVo> companys = contractPaymentScheduleMapper.selectAgingCompany(DataScope.of("comp_id"));
@@ -383,54 +386,54 @@
 
 		List<AgingAnalysisVo> result = new ArrayList<>();
 		AgingQueryDTO queryDTO = new AgingQueryDTO();
-		if (CollUtil.contains(compIds,SecurityUtils.getUser().getCompId())){
+		if (CollUtil.contains(compIds, SecurityUtils.getUser().getCompId())) {
 			queryDTO.setCompanyId(SecurityUtils.getUser().getCompId());
 		}
 		List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
-		items.stream().forEach(item->{
+		items.stream().forEach(item -> {
 			AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
 			agingAnalysisVo.setCompanyName(item.getLabel());
 			queryDTO.setAreaId(item.getItemValue());
 			List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
 			//琛ュ叏鏁版嵁
-			if (CollUtil.isEmpty(companyAgingVo)){
+			if (CollUtil.isEmpty(companyAgingVo)) {
 				companyAgingVo = new ArrayList<>();
-				AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
-				AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
-				AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
-				AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
-				AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
-				AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
+				AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
+				AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
+				AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
+				AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
+				AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 				companyAgingVo.add(agingVo1);
 				companyAgingVo.add(agingVo2);
 				companyAgingVo.add(agingVo3);
 				companyAgingVo.add(agingVo4);
 				companyAgingVo.add(agingVo5);
 				companyAgingVo.add(agingVo6);
-			}else {
+			} else {
 				List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
-				if (!CollUtil.contains(overdueRanges,"0-30澶�")){
-					AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "0-30澶�")) {
+					AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo1);
 				}
-				if (!CollUtil.contains(overdueRanges,"31-60澶�")){
-					AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "31-60澶�")) {
+					AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo2);
 				}
-				if (!CollUtil.contains(overdueRanges,"61-90澶�")){
-					AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "61-90澶�")) {
+					AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo3);
 				}
-				if (!CollUtil.contains(overdueRanges,"91-180澶�")){
-					AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "91-180澶�")) {
+					AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo4);
 				}
-				if (!CollUtil.contains(overdueRanges,"181-365澶�")){
-					AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "181-365澶�")) {
+					AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo5);
 				}
-				if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
-					AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "1骞翠互涓�")) {
+					AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo6);
 				}
 			}
@@ -460,7 +463,7 @@
 
 					if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) {
 						return null;
-					}else {
+					} else {
 						return new BigDecimal("100");
 					}
 				})
@@ -474,7 +477,7 @@
 	public R agingAnalysisByIndustry(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("industry_sector");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("琛屼笟瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 		List<Long> compIds = new ArrayList<>();
@@ -487,54 +490,54 @@
 
 		List<AgingAnalysisVo> result = new ArrayList<>();
 		AgingQueryDTO queryDTO = new AgingQueryDTO();
-		if (CollUtil.contains(compIds,SecurityUtils.getUser().getCompId())){
+		if (CollUtil.contains(compIds, SecurityUtils.getUser().getCompId())) {
 			queryDTO.setCompanyId(SecurityUtils.getUser().getCompId());
 		}
 		List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
-		items.stream().forEach(item->{
+		items.stream().forEach(item -> {
 			AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
 			agingAnalysisVo.setCompanyName(item.getLabel());
 			queryDTO.setIndustryId(item.getItemValue());
 			List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
 			//琛ュ叏鏁版嵁
-			if (CollUtil.isEmpty(companyAgingVo)){
+			if (CollUtil.isEmpty(companyAgingVo)) {
 				companyAgingVo = new ArrayList<>();
-				AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
-				AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
-				AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
-				AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
-				AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
-				AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
+				AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
+				AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
+				AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
+				AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
+				AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 				companyAgingVo.add(agingVo1);
 				companyAgingVo.add(agingVo2);
 				companyAgingVo.add(agingVo3);
 				companyAgingVo.add(agingVo4);
 				companyAgingVo.add(agingVo5);
 				companyAgingVo.add(agingVo6);
-			}else {
+			} else {
 				List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
-				if (!CollUtil.contains(overdueRanges,"0-30澶�")){
-					AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "0-30澶�")) {
+					AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo1);
 				}
-				if (!CollUtil.contains(overdueRanges,"31-60澶�")){
-					AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "31-60澶�")) {
+					AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo2);
 				}
-				if (!CollUtil.contains(overdueRanges,"61-90澶�")){
-					AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "61-90澶�")) {
+					AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo3);
 				}
-				if (!CollUtil.contains(overdueRanges,"91-180澶�")){
-					AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "91-180澶�")) {
+					AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo4);
 				}
-				if (!CollUtil.contains(overdueRanges,"181-365澶�")){
-					AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "181-365澶�")) {
+					AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo5);
 				}
-				if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
-					AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "1骞翠互涓�")) {
+					AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo6);
 				}
 			}
@@ -564,7 +567,7 @@
 
 					if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) {
 						return null;
-					}else {
+					} else {
 						return new BigDecimal("100");
 					}
 				})
@@ -586,9 +589,9 @@
 			List<AgingAnalysisVo> result = new ArrayList<>();
 			AgingQueryDTO queryDTO = new AgingQueryDTO();
 			List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalShip(null);
-			compIds.stream().forEach(compId->{
+			compIds.stream().forEach(compId -> {
 				R<SysDept> r = remoteDeptService.getById(compId);
-				if (!r.isOk()){
+				if (!r.isOk()) {
 					return;
 				}
 				SysDept dept = r.getData();
@@ -597,44 +600,44 @@
 				queryDTO.setCompanyId(dept.getDeptId());
 				List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalShip(queryDTO);
 				//琛ュ叏鏁版嵁
-				if (CollUtil.isEmpty(companyAgingVo)){
+				if (CollUtil.isEmpty(companyAgingVo)) {
 					companyAgingVo = new ArrayList<>();
-					AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
-					AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
-					AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
-					AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
-					AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
-					AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+					AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
+					AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
+					AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
+					AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
+					AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
+					AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo1);
 					companyAgingVo.add(agingVo2);
 					companyAgingVo.add(agingVo3);
 					companyAgingVo.add(agingVo4);
 					companyAgingVo.add(agingVo5);
 					companyAgingVo.add(agingVo6);
-				}else {
+				} else {
 					List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
-					if (!CollUtil.contains(overdueRanges,"0-30澶�")){
-						AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "0-30澶�")) {
+						AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo1);
 					}
-					if (!CollUtil.contains(overdueRanges,"31-60澶�")){
-						AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "31-60澶�")) {
+						AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo2);
 					}
-					if (!CollUtil.contains(overdueRanges,"61-90澶�")){
-						AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "61-90澶�")) {
+						AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo3);
 					}
-					if (!CollUtil.contains(overdueRanges,"91-180澶�")){
-						AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "91-180澶�")) {
+						AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo4);
 					}
-					if (!CollUtil.contains(overdueRanges,"181-365澶�")){
-						AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "181-365澶�")) {
+						AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo5);
 					}
-					if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
-						AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "1骞翠互涓�")) {
+						AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo6);
 					}
 				}
@@ -664,7 +667,7 @@
 
 						if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) {
 							return null;
-						}else {
+						} else {
 							return new BigDecimal("100");
 						}
 					})
@@ -683,9 +686,9 @@
 			List<AgingAnalysisVo> result = new ArrayList<>();
 			AgingQueryDTO queryDTO = new AgingQueryDTO();
 			List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalInvoice(null);
-			compIds.stream().forEach(compId->{
+			compIds.stream().forEach(compId -> {
 				R<SysDept> r = remoteDeptService.getById(compId);
-				if (!r.isOk()){
+				if (!r.isOk()) {
 					return;
 				}
 				SysDept dept = r.getData();
@@ -694,44 +697,44 @@
 				queryDTO.setCompanyId(dept.getDeptId());
 				List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalInvoice(queryDTO);
 				//琛ュ叏鏁版嵁
-				if (CollUtil.isEmpty(companyAgingVo)){
+				if (CollUtil.isEmpty(companyAgingVo)) {
 					companyAgingVo = new ArrayList<>();
-					AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
-					AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
-					AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
-					AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
-					AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
-					AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+					AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
+					AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
+					AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
+					AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
+					AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
+					AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo1);
 					companyAgingVo.add(agingVo2);
 					companyAgingVo.add(agingVo3);
 					companyAgingVo.add(agingVo4);
 					companyAgingVo.add(agingVo5);
 					companyAgingVo.add(agingVo6);
-				}else {
+				} else {
 					List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
-					if (!CollUtil.contains(overdueRanges,"0-30澶�")){
-						AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "0-30澶�")) {
+						AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo1);
 					}
-					if (!CollUtil.contains(overdueRanges,"31-60澶�")){
-						AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "31-60澶�")) {
+						AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo2);
 					}
-					if (!CollUtil.contains(overdueRanges,"61-90澶�")){
-						AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "61-90澶�")) {
+						AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo3);
 					}
-					if (!CollUtil.contains(overdueRanges,"91-180澶�")){
-						AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "91-180澶�")) {
+						AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo4);
 					}
-					if (!CollUtil.contains(overdueRanges,"181-365澶�")){
-						AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "181-365澶�")) {
+						AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo5);
 					}
-					if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
-						AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+					if (!CollUtil.contains(overdueRanges, "1骞翠互涓�")) {
+						AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 						companyAgingVo.add(agingVo6);
 					}
 				}
@@ -761,7 +764,7 @@
 
 						if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) {
 							return null;
-						}else {
+						} else {
 							return new BigDecimal("100");
 						}
 					})
@@ -777,56 +780,56 @@
 	public R agingAnalysisByMarket(AnalysisCommonDTO commonDTO) {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("market_type");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("甯傚満绫诲瀷瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 		List<AgingAnalysisVo> result = new ArrayList<>();
 		AgingQueryDTO queryDTO = new AgingQueryDTO();
 		List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotal(null);
-		items.stream().forEach(item->{
+		items.stream().forEach(item -> {
 			AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
 			agingAnalysisVo.setCompanyName(item.getLabel());
 			queryDTO.setClassId(item.getItemValue());
 			List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
 			//琛ュ叏鏁版嵁
-			if (CollUtil.isEmpty(companyAgingVo)){
+			if (CollUtil.isEmpty(companyAgingVo)) {
 				companyAgingVo = new ArrayList<>();
-				AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
-				AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
-				AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
-				AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
-				AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
-				AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
+				AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
+				AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
+				AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
+				AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
+				AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 				companyAgingVo.add(agingVo1);
 				companyAgingVo.add(agingVo2);
 				companyAgingVo.add(agingVo3);
 				companyAgingVo.add(agingVo4);
 				companyAgingVo.add(agingVo5);
 				companyAgingVo.add(agingVo6);
-			}else {
+			} else {
 				List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
-				if (!CollUtil.contains(overdueRanges,"0-30澶�")){
-					AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "0-30澶�")) {
+					AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo1);
 				}
-				if (!CollUtil.contains(overdueRanges,"31-60澶�")){
-					AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "31-60澶�")) {
+					AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo2);
 				}
-				if (!CollUtil.contains(overdueRanges,"61-90澶�")){
-					AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "61-90澶�")) {
+					AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo3);
 				}
-				if (!CollUtil.contains(overdueRanges,"91-180澶�")){
-					AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "91-180澶�")) {
+					AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo4);
 				}
-				if (!CollUtil.contains(overdueRanges,"181-365澶�")){
-					AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "181-365澶�")) {
+					AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo5);
 				}
-				if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
-					AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "1骞翠互涓�")) {
+					AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo6);
 				}
 			}
@@ -856,7 +859,7 @@
 
 					if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) {
 						return null;
-					}else {
+					} else {
 						return new BigDecimal("100");
 					}
 				})
@@ -878,9 +881,9 @@
 		List<AgingAnalysisVo> result = new ArrayList<>();
 		AgingQueryDTO queryDTO = new AgingQueryDTO();
 		List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalScale(null);
-		compIds.stream().forEach(compId->{
+		compIds.stream().forEach(compId -> {
 			R<SysDept> r = remoteDeptService.getById(compId);
-			if (!r.isOk()){
+			if (!r.isOk()) {
 				return;
 			}
 			SysDept dept = r.getData();
@@ -889,44 +892,44 @@
 			queryDTO.setCompanyId(dept.getDeptId());
 			List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalScale(queryDTO);
 			//琛ュ叏鏁版嵁
-			if (CollUtil.isEmpty(companyAgingVo)){
+			if (CollUtil.isEmpty(companyAgingVo)) {
 				companyAgingVo = new ArrayList<>();
-				AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
-				AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
-				AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
-				AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
-				AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
-				AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
+				AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
+				AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
+				AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
+				AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
+				AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 				companyAgingVo.add(agingVo1);
 				companyAgingVo.add(agingVo2);
 				companyAgingVo.add(agingVo3);
 				companyAgingVo.add(agingVo4);
 				companyAgingVo.add(agingVo5);
 				companyAgingVo.add(agingVo6);
-			}else {
+			} else {
 				List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
-				if (!CollUtil.contains(overdueRanges,"0-30澶�")){
-					AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "0-30澶�")) {
+					AgingVo agingVo1 = new AgingVo(1L, "0-30澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo1);
 				}
-				if (!CollUtil.contains(overdueRanges,"31-60澶�")){
-					AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "31-60澶�")) {
+					AgingVo agingVo2 = new AgingVo(2L, "31-60澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo2);
 				}
-				if (!CollUtil.contains(overdueRanges,"61-90澶�")){
-					AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "61-90澶�")) {
+					AgingVo agingVo3 = new AgingVo(3L, "61-90澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo3);
 				}
-				if (!CollUtil.contains(overdueRanges,"91-180澶�")){
-					AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "91-180澶�")) {
+					AgingVo agingVo4 = new AgingVo(4L, "91-180澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo4);
 				}
-				if (!CollUtil.contains(overdueRanges,"181-365澶�")){
-					AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "181-365澶�")) {
+					AgingVo agingVo5 = new AgingVo(5L, "181-365澶�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo5);
 				}
-				if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
-					AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
+				if (!CollUtil.contains(overdueRanges, "1骞翠互涓�")) {
+					AgingVo agingVo6 = new AgingVo(6L, "1骞翠互涓�", new BigDecimal("0"), null);
 					companyAgingVo.add(agingVo6);
 				}
 			}
@@ -956,7 +959,7 @@
 
 					if (agingAnalysisVo.getAmount().get(i) == null || agingAnalysisVo.getAmount().get(i).compareTo(BigDecimal.ZERO) == 0) {
 						return null;
-					}else {
+					} else {
 						return new BigDecimal("100");
 					}
 				})
@@ -967,22 +970,183 @@
 	}
 
 	@Override
+	public R homeZbjtChart(HomeZbjtDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getType())) {
+			return R.failed("璇蜂紶type");
+		}
+		JSONObject result = new JSONObject();
+		HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
+		result.put("chart-sr", handleChart(kp, queryDTO.getType()));
+		HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
+		result.put("chart-hk", handleChart(hk, queryDTO.getType()));
+		HomeZbjtVo htqd = contractMapper.homeZbjt();
+		result.put("chart-ht", handleChart(htqd, queryDTO.getType()));
+		return R.ok(result);
+	}
+
+//	private JSONArray handleTable(HomeZbjtVo kp, String type) {
+//		kp.calcZbjt(kp);
+//		JSONArray array = new JSONArray();
+//		if (StrUtil.equals(type, "1")) {
+//			JSONObject smj = new JSONObject();
+//			smj.put("name", "鐭崇叅鏈�");
+//			smj.put("lj", kp.getSmjby() == null ? BigDecimal.ZERO : kp.getSmjby());
+//			smj.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
+//				smj.put("zb", smj.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			smj.put("tb", "");
+//			array.add(smj);
+//			JSONObject sgb = new JSONObject();
+//			sgb.put("name", "鐭冲伐娉�");
+//			sgb.put("lj", kp.getSgbby() == null ? BigDecimal.ZERO : kp.getSgbby());
+//			sgb.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
+//				sgb.put("zb", sgb.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			sgb.put("tb", "");
+//			array.add(sgb);
+//			JSONObject tf = new JSONObject();
+//			tf.put("name", "閫氭柟鍏徃");
+//			tf.put("lj", kp.getTfby() == null ? BigDecimal.ZERO : kp.getTfby());
+//			tf.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
+//				tf.put("zb", tf.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//
+//			tf.put("tb", "");
+//			array.add(tf);
+//			JSONObject jxc = new JSONObject();
+//			jxc.put("name", "鏈烘鍘�");
+//			jxc.put("lj", kp.getJxcby() == null ? BigDecimal.ZERO : kp.getJxcby());
+//
+//			jxc.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
+//				jxc.put("zb", jxc.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			jxc.put("tb", "");
+//			array.add(jxc);
+//			JSONObject ymj = new JSONObject();
+//			ymj.put("name", "涓�鐓ゆ満");
+//			ymj.put("lj", kp.getYmjby() == null ? BigDecimal.ZERO : kp.getYmjby());
+//			ymj.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
+//				ymj.put("zb", ymj.getBigDecimal("lj").divide(kp.getZbby(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//
+//			ymj.put("tb", "");
+//			array.add(ymj);
+//		}
+//		if (StrUtil.equals(type, "2")) {
+//			JSONObject smj = new JSONObject();
+//			smj.put("name", "鐭崇叅鏈�");
+//			smj.put("lj", kp.getSmjbn() == null ? BigDecimal.ZERO : kp.getSmjbn());
+//			smj.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
+//				smj.put("zb", smj.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			smj.put("tb", "");
+//			array.add(smj);
+//			JSONObject sgb = new JSONObject();
+//			sgb.put("name", "鐭冲伐娉�");
+//			sgb.put("lj", kp.getSgbbn() == null ? BigDecimal.ZERO : kp.getSgbbn());
+//			sgb.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
+//				sgb.put("zb", sgb.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			sgb.put("tb", "");
+//			array.add(sgb);
+//			JSONObject tf = new JSONObject();
+//			tf.put("name", "閫氭柟鍏徃");
+//			tf.put("lj", kp.getTfbn() == null ? BigDecimal.ZERO : kp.getTfbn());
+//			tf.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
+//				tf.put("zb", tf.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			tf.put("tb", "");
+//			array.add(tf);
+//			JSONObject jxc = new JSONObject();
+//			jxc.put("name", "鏈烘鍘�");
+//			jxc.put("lj", kp.getJxcbn() == null ? BigDecimal.ZERO : kp.getJxcbn());
+//			jxc.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
+//				jxc.put("zb", jxc.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			jxc.put("tb", "");
+//			array.add(jxc);
+//			JSONObject ymj = new JSONObject();
+//			ymj.put("name", "涓�鐓ゆ満");
+//			ymj.put("lj", kp.getYmjbn() == null ? BigDecimal.ZERO : kp.getYmjbn());
+//			ymj.put("zb", "");
+//			if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
+//				ymj.put("zb", ymj.getBigDecimal("lj").divide(kp.getZbbn(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			ymj.put("tb", "");
+//			array.add(ymj);
+//		}
+//		return array;
+//	}
+
+	private List<BigDecimal> handleChart(HomeZbjtVo htqd, String type) {
+		if (StrUtil.equals(type, "1")) {
+			List<BigDecimal> srList = new ArrayList<>();
+			srList.add(htqd.getSmjby() == null ? BigDecimal.ZERO : htqd.getSmjby());
+			srList.add(htqd.getSgbby() == null ? BigDecimal.ZERO : htqd.getSgbby());
+			srList.add(htqd.getTfby() == null ? BigDecimal.ZERO : htqd.getTfby());
+			srList.add(htqd.getJxcby() == null ? BigDecimal.ZERO : htqd.getJxcby());
+			srList.add(htqd.getYmjby() == null ? BigDecimal.ZERO : htqd.getYmjby());
+			return srList;
+		}
+		if (StrUtil.equals(type, "2")) {
+			List<BigDecimal> srList = new ArrayList<>();
+			srList.add(htqd.getSmjbn() == null ? BigDecimal.ZERO : htqd.getSmjbn());
+			srList.add(htqd.getSgbbn() == null ? BigDecimal.ZERO : htqd.getSgbbn());
+			srList.add(htqd.getTfbn() == null ? BigDecimal.ZERO : htqd.getTfbn());
+			srList.add(htqd.getJxcbn() == null ? BigDecimal.ZERO : htqd.getJxcbn());
+			srList.add(htqd.getYmjbn() == null ? BigDecimal.ZERO : htqd.getYmjbn());
+			return srList;
+		}
+		return null;
+	}
+
+	@Override
 	public R homeZbjt() {
-		List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>();
+//		List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>();
+//		String curYear = DateUtil.year(new Date()) + "";
+//		String curMonth = DateUtil.month(new Date()) + "";
 
 		//鍑鸿揣
 //		HomeZbjtVo ch = contractOutBoundMapper.homeZbjt();
 //		homeZbjtVoList.add(ch);
 		//鍙繚鐣欓攢鍞敹鍏� 鍥炴 鏂板鍚堝悓
 		//寮�绁�
-		HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
-		homeZbjtVoList.add(kp);
+//		HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
+//		kp.calcZbjt(kp);
+//
+//		kp = handleWCAndTB("2", curMonth, curYear, kp);
+//
+//		homeZbjtVoList.add(kp);
 		//鍥炴
-		HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
-		homeZbjtVoList.add(hk);
+//		HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
+//		hk.calcZbjt(hk);
+//		hk = handleWCAndTB("3", curMonth, curYear, hk);
+//
+//		homeZbjtVoList.add(hk);
 		//鍚堝悓绛捐 sgb smj jxc tfgs ymj
-		HomeZbjtVo htqd = contractMapper.homeZbjt();
-		homeZbjtVoList.add(htqd);
+//		HomeZbjtVo htqd = contractMapper.homeZbjt();
+//		htqd.calcZbjt(htqd);
+//		hk = handleWCAndTB("1", curMonth, curYear, htqd);
+//		homeZbjtVoList.add(htqd);
 		//璧婇攢浜х敓鍊� 浠婂ぉ鍙戣揣鍔犱粖澶╁紑绁ㄩ
 //		if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){
 //			HomeZbjtVo sxsy = ch.add(kp);
@@ -1012,7 +1176,116 @@
 //		//閫炬湡浜х敓鍊� 浠婂ぉ浜х敓-浠婂ぉ宸蹭粯
 //
 //		homeZbjtVoList.add(yq);
-		return R.ok(homeZbjtVoList);
+		return R.ok();
+	}
+
+	private HomeZbjtVo handleWCAndTB(String planType, String curMonth, String curYear, HomeZbjtVo kp) {
+		List<Long> compIds = new ArrayList<>();
+		compIds.add(2089995177814495234L);
+		compIds.add(2089996921978040321L);
+		compIds.add(2089997578009128962L);
+		compIds.add(2101966257365045249L);
+		//瑁呭
+//		AnnualPlanTotalVo planListZB = annualPlanMapper.selectPlanYear(curYear, planType);
+//		if (ObjUtil.isNotNull(planListZB)) {
+//			AnnualPlanTotalVo planzb = BeanUtil.copyProperties(planListZB, AnnualPlanTotalVo.class);
+//			BigDecimal curMonAmount = planzb.getMonthAmount(curMonth);
+//			if (ObjUtil.isNotNull(kp.getZbby()) && kp.getZbby().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getZbby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			BigDecimal yearAmount = planzb.getTotalAmount();
+//			if (ObjUtil.isNotNull(kp.getZbbn()) && kp.getZbbn().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getZbbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//		}
+//		//鐭崇叅鏈烘敹鍏�
+//		AnnualPlan planListSMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+//				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+//				.in(AnnualPlan::getCompId, compIds).last("limit 1"));
+//		if (ObjUtil.isNotNull(planListSMJ)) {
+//			AnnualPlanTotalVo plansmj = BeanUtil.copyProperties(planListSMJ, AnnualPlanTotalVo.class);
+//			BigDecimal curMonAmount = plansmj.getMonthAmount(curMonth);
+//			if (ObjUtil.isNotNull(kp.getSmjby()) && kp.getSmjby().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getSmjby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			BigDecimal yearAmount = plansmj.getTotalAmount();
+//			if (ObjUtil.isNotNull(kp.getSmjbn()) && kp.getSmjbn().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getSmjbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//		}
+//		//鐭冲伐娉垫敹鍏�
+//		AnnualPlan planListSRSGB = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+//				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+//				.eq(AnnualPlan::getCompId, 2056556196124250113L).last("limit 1"));
+//		if (ObjUtil.isNotNull(planListSRSGB)) {
+//			AnnualPlanTotalVo plansgb = BeanUtil.copyProperties(planListSRSGB, AnnualPlanTotalVo.class);
+//			BigDecimal curMonAmount = plansgb.getMonthAmount(curMonth);
+//			if (ObjUtil.isNotNull(kp.getSgbby()) && kp.getSgbby().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getSgbby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			BigDecimal yearAmount = plansgb.getTotalAmount();
+//			if (ObjUtil.isNotNull(kp.getSgbbn()) && kp.getSgbbn().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getSgbbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//		}
+//		//閫氭柟鍏徃鏀跺叆
+//		AnnualPlan planListSRTFGS = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+//				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+//				.eq(AnnualPlan::getCompId, 2056556421857497090L).last("limit 1"));
+//		if (ObjUtil.isNotNull(planListSRTFGS)) {
+//			AnnualPlanTotalVo plantf = BeanUtil.copyProperties(planListSRTFGS, AnnualPlanTotalVo.class);
+//			BigDecimal curMonAmount = plantf.getMonthAmount(curMonth);
+//			if (ObjUtil.isNotNull(kp.getTfby()) && kp.getTfby().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getTfby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			BigDecimal yearAmount = plantf.getTotalAmount();
+//			if (ObjUtil.isNotNull(kp.getTfbn()) && kp.getTfbn().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getTfbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//		}
+//		//鏈烘鍘傛敹鍏�
+//		AnnualPlan planListSRJXC = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+//				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+//				.eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
+//		if (ObjUtil.isNotNull(planListSRJXC)) {
+//			AnnualPlanTotalVo planjxc = BeanUtil.copyProperties(planListSRJXC, AnnualPlanTotalVo.class);
+//			BigDecimal curMonAmount = planjxc.getMonthAmount(curMonth);
+//			if (ObjUtil.isNotNull(kp.getJxcby()) && kp.getJxcby().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getJxcby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			BigDecimal yearAmount = planjxc.getTotalAmount();
+//			if (ObjUtil.isNotNull(kp.getJxcbn()) && kp.getJxcbn().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getJxcbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//		}
+//		//涓�鐓ゆ満鏀跺叆
+//		AnnualPlan planListHYMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+//				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+//				.eq(AnnualPlan::getCompId, 2056556535640576002L).last("limit 1"));
+//		if (ObjUtil.isNotNull(planListHYMJ)) {
+//			AnnualPlanTotalVo planymj = BeanUtil.copyProperties(planListHYMJ, AnnualPlanTotalVo.class);
+//			BigDecimal curMonAmount = planymj.getMonthAmount(curMonth);
+//			if (ObjUtil.isNotNull(kp.getYmjby()) && kp.getYmjby().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getYmjby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//			BigDecimal yearAmount = planymj.getTotalAmount();
+//			if (ObjUtil.isNotNull(kp.getYmjbn()) && kp.getYmjbn().compareTo(new BigDecimal("0")) > 0) {
+//				kp.setSmjbywc(kp.getYmjbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+//						.setScale(2, RoundingMode.HALF_UP) + "%");
+//			}
+//		}
+		return kp;
 	}
 
 	@Override
@@ -1074,9 +1347,10 @@
 		compIds.add(Long.valueOf(tfgs));
 		compIds.add(Long.valueOf(ymj));
 		compIds.add(Long.valueOf(jxc));
-		if (compIds.contains(userId)){
+		if (compIds.contains(userId)) {
 			return R.ok(false);
-		};
+		}
+		;
 		return R.ok(true);
 	}
 
@@ -1100,19 +1374,18 @@
 		LocalDateTime endOfYear = today.withDayOfYear(today.lengthOfYear()).atTime(LocalTime.MAX);
 
 		MPJLambdaWrapper<Contract> wrapper = new MPJLambdaWrapper<Contract>()
-		.selectAll(Contract.class)
-				.leftJoin(BusinessCustomer.class,BusinessCustomer::getId,Contract::getPartyAId)
-				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()),Contract::getCompId,queryDTO.getQueryCompId())
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),Contract::getSignDate,startOfDay)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),Contract::getSignDate,endOfDay)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),Contract::getSignDate,startOfMonth)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),Contract::getSignDate,endOfMonth)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),Contract::getSignDate,startOfYear)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),Contract::getSignDate,endOfYear)
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
-				.orderByDesc(Contract::getCreateTime)
-				;
+				.selectAll(Contract.class)
+				.leftJoin(BusinessCustomer.class, BusinessCustomer::getId, Contract::getPartyAId)
+				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()), Contract::getCompId, queryDTO.getQueryCompId())
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), Contract::getSignDate, startOfDay)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), Contract::getSignDate, endOfDay)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), Contract::getSignDate, startOfMonth)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), Contract::getSignDate, endOfMonth)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), Contract::getSignDate, startOfYear)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), Contract::getSignDate, endOfYear)
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()), BusinessCustomer::getAreaId, queryDTO.getQueryArea())
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()), BusinessCustomer::getExportServiceAttr, queryDTO.getQueryServiceAttr())
+				.orderByDesc(Contract::getCreateTime);
 		return R.ok(contractMapper.selectList(wrapper));
 	}
 
@@ -1136,18 +1409,17 @@
 		LocalDateTime endOfYear = today.withDayOfYear(today.lengthOfYear()).atTime(LocalTime.MAX);
 		MPJLambdaWrapper<PaymentSlip> wrapper = new MPJLambdaWrapper<PaymentSlip>()
 				.selectAll(PaymentSlip.class)
-				.leftJoin(BusinessCustomer.class,BusinessCustomer::getId,PaymentSlip::getBusGuestId)
-				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()),Contract::getCompId,queryDTO.getQueryCompId())
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),PaymentSlip::getPaymentTime,startOfDay)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),PaymentSlip::getPaymentTime,endOfDay)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),PaymentSlip::getPaymentTime,startOfMonth)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),PaymentSlip::getPaymentTime,endOfMonth)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),PaymentSlip::getPaymentTime,startOfYear)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),PaymentSlip::getPaymentTime,endOfYear)
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
-				.orderByDesc(PaymentSlip::getCreateTime)
-				;
+				.leftJoin(BusinessCustomer.class, BusinessCustomer::getId, PaymentSlip::getBusGuestId)
+				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()), Contract::getCompId, queryDTO.getQueryCompId())
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), PaymentSlip::getPaymentTime, startOfDay)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), PaymentSlip::getPaymentTime, endOfDay)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), PaymentSlip::getPaymentTime, startOfMonth)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), PaymentSlip::getPaymentTime, endOfMonth)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), PaymentSlip::getPaymentTime, startOfYear)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), PaymentSlip::getPaymentTime, endOfYear)
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()), BusinessCustomer::getAreaId, queryDTO.getQueryArea())
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()), BusinessCustomer::getExportServiceAttr, queryDTO.getQueryServiceAttr())
+				.orderByDesc(PaymentSlip::getCreateTime);
 		return R.ok(paymentSlipMapper.selectList(wrapper));
 	}
 
@@ -1172,26 +1444,25 @@
 		MPJLambdaWrapper<ContractOutBound> wrapper = new MPJLambdaWrapper<ContractOutBound>()
 				.selectAll(ContractOutBound.class)
 				.select(Contract::getContractNo)
-				.selectAs(BusinessCustomer::getCompanyName,"busGuestName")
+				.selectAs(BusinessCustomer::getCompanyName, "busGuestName")
 				.select(ContractSubjectMatter::getUnitPrice)
-				.leftJoin(Contract.class,Contract::getId,ContractOutBound::getContractId)
-				.leftJoin(BusinessCustomer.class,BusinessCustomer::getId,ContractOutBound::getBusGuestId)
-				.leftJoin(ContractSubjectMatter.class, on->
-						on.eq(ContractSubjectMatter::getContractId,ContractOutBound::getContractId)
-								.eq(ContractSubjectMatter::getMaterialCode,ContractOutBound::getSubjectMatterCode)
+				.leftJoin(Contract.class, Contract::getId, ContractOutBound::getContractId)
+				.leftJoin(BusinessCustomer.class, BusinessCustomer::getId, ContractOutBound::getBusGuestId)
+				.leftJoin(ContractSubjectMatter.class, on ->
+						on.eq(ContractSubjectMatter::getContractId, ContractOutBound::getContractId)
+								.eq(ContractSubjectMatter::getMaterialCode, ContractOutBound::getSubjectMatterCode)
 				)
-				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()),Contract::getCompId,queryDTO.getQueryCompId())
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),ContractOutBound::getOutBoundTime,startOfDay)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),ContractOutBound::getOutBoundTime,endOfDay)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),ContractOutBound::getOutBoundTime,startOfMonth)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),ContractOutBound::getOutBoundTime,endOfMonth)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractOutBound::getOutBoundTime,startOfYear)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractOutBound::getOutBoundTime,endOfYear)
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
-				.orderByDesc(ContractOutBound::getCreateTime)
-				;
-		return R.ok(contractOutBoundMapper.selectJoinList(HomeOutBoundVo.class,wrapper));
+				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()), Contract::getCompId, queryDTO.getQueryCompId())
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), ContractOutBound::getOutBoundTime, startOfDay)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), ContractOutBound::getOutBoundTime, endOfDay)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), ContractOutBound::getOutBoundTime, startOfMonth)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), ContractOutBound::getOutBoundTime, endOfMonth)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), ContractOutBound::getOutBoundTime, startOfYear)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), ContractOutBound::getOutBoundTime, endOfYear)
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()), BusinessCustomer::getAreaId, queryDTO.getQueryArea())
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()), BusinessCustomer::getExportServiceAttr, queryDTO.getQueryServiceAttr())
+				.orderByDesc(ContractOutBound::getCreateTime);
+		return R.ok(contractOutBoundMapper.selectJoinList(HomeOutBoundVo.class, wrapper));
 	}
 
 	@Override
@@ -1215,21 +1486,20 @@
 		MPJLambdaWrapper<ContractInvoice> wrapper = new MPJLambdaWrapper<ContractInvoice>()
 				.selectAll(ContractInvoice.class)
 				.select(Contract::getContractNo)
-				.selectAs(BusinessCustomer::getCompanyName,"busGuestName")
-				.leftJoin(Contract.class,Contract::getId,ContractInvoice::getContractId)
-				.leftJoin(BusinessCustomer.class,BusinessCustomer::getId,Contract::getPartyAId)
-				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()),Contract::getCompId,queryDTO.getQueryCompId())
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),ContractInvoice::getInvoiceTime,startOfDay)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),ContractInvoice::getInvoiceTime,endOfDay)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),ContractInvoice::getInvoiceTime,startOfMonth)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),ContractInvoice::getInvoiceTime,endOfMonth)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractInvoice::getInvoiceTime,startOfYear)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractInvoice::getInvoiceTime,endOfYear)
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
-				.orderByDesc(ContractInvoice::getCreateTime)
-				;
-		return R.ok(contractInvoiceMapper.selectJoinList(HomeInvoiceVo.class,wrapper));
+				.selectAs(BusinessCustomer::getCompanyName, "busGuestName")
+				.leftJoin(Contract.class, Contract::getId, ContractInvoice::getContractId)
+				.leftJoin(BusinessCustomer.class, BusinessCustomer::getId, Contract::getPartyAId)
+				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()), Contract::getCompId, queryDTO.getQueryCompId())
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), ContractInvoice::getInvoiceTime, startOfDay)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), ContractInvoice::getInvoiceTime, endOfDay)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), ContractInvoice::getInvoiceTime, startOfMonth)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), ContractInvoice::getInvoiceTime, endOfMonth)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), ContractInvoice::getInvoiceTime, startOfYear)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), ContractInvoice::getInvoiceTime, endOfYear)
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()), BusinessCustomer::getAreaId, queryDTO.getQueryArea())
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()), BusinessCustomer::getExportServiceAttr, queryDTO.getQueryServiceAttr())
+				.orderByDesc(ContractInvoice::getCreateTime);
+		return R.ok(contractInvoiceMapper.selectJoinList(HomeInvoiceVo.class, wrapper));
 	}
 
 	@Override
@@ -1253,26 +1523,25 @@
 		MPJLambdaWrapper<ContractOutBound> wrapper = new MPJLambdaWrapper<ContractOutBound>()
 				.selectAll(ContractOutBound.class)
 				.select(Contract::getContractNo)
-				.selectAs(BusinessCustomer::getCompanyName,"busGuestName")
+				.selectAs(BusinessCustomer::getCompanyName, "busGuestName")
 				.select(ContractSubjectMatter::getUnitPrice)
-				.leftJoin(Contract.class,Contract::getId,ContractOutBound::getContractId)
-				.leftJoin(BusinessCustomer.class,BusinessCustomer::getId,Contract::getPartyAId)
-				.leftJoin(ContractSubjectMatter.class, on->
-						on.eq(ContractSubjectMatter::getContractId,ContractOutBound::getContractId)
-						.eq(ContractSubjectMatter::getMaterialCode,ContractOutBound::getSubjectMatterCode)
+				.leftJoin(Contract.class, Contract::getId, ContractOutBound::getContractId)
+				.leftJoin(BusinessCustomer.class, BusinessCustomer::getId, Contract::getPartyAId)
+				.leftJoin(ContractSubjectMatter.class, on ->
+						on.eq(ContractSubjectMatter::getContractId, ContractOutBound::getContractId)
+								.eq(ContractSubjectMatter::getMaterialCode, ContractOutBound::getSubjectMatterCode)
 				)
-				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()),Contract::getCompId,queryDTO.getQueryCompId())
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),ContractOutBound::getOutBoundTime,startOfDay)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),ContractOutBound::getOutBoundTime,endOfDay)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),ContractOutBound::getOutBoundTime,startOfMonth)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),ContractOutBound::getOutBoundTime,endOfMonth)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractOutBound::getOutBoundTime,startOfYear)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),ContractOutBound::getOutBoundTime,endOfYear)
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
-				.orderByDesc(ContractOutBound::getCreateTime)
-				;
-		return R.ok(contractOutBoundMapper.selectJoinList(HomeCreditSaleVo.class,wrapper));
+				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()), Contract::getCompId, queryDTO.getQueryCompId())
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), ContractOutBound::getOutBoundTime, startOfDay)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), ContractOutBound::getOutBoundTime, endOfDay)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), ContractOutBound::getOutBoundTime, startOfMonth)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), ContractOutBound::getOutBoundTime, endOfMonth)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), ContractOutBound::getOutBoundTime, startOfYear)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), ContractOutBound::getOutBoundTime, endOfYear)
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()), BusinessCustomer::getAreaId, queryDTO.getQueryArea())
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()), BusinessCustomer::getExportServiceAttr, queryDTO.getQueryServiceAttr())
+				.orderByDesc(ContractOutBound::getCreateTime);
+		return R.ok(contractOutBoundMapper.selectJoinList(HomeCreditSaleVo.class, wrapper));
 	}
 
 	@Override
@@ -1296,33 +1565,32 @@
 		MPJLambdaWrapper<CurrentOverdue> wrapper = new MPJLambdaWrapper<CurrentOverdue>()
 				.selectAll(CurrentOverdue.class)
 				.select(Contract::getContractNo)
-				.selectAs(BusinessCustomer::getCompanyName,"busGuestName")
-				.leftJoin(BusinessCustomer.class,BusinessCustomer::getId,CurrentOverdue::getBusGuestId)
-				.leftJoin(Contract.class,Contract::getId,CurrentOverdue::getContractId)
-				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()),Contract::getCompId,queryDTO.getQueryCompId())
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),CurrentOverdue::getContractExpirTime,startOfDay)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"1"),CurrentOverdue::getContractExpirTime,endOfDay)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),CurrentOverdue::getContractExpirTime,startOfMonth)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"2"),CurrentOverdue::getContractExpirTime,endOfMonth)
-				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),CurrentOverdue::getContractExpirTime,startOfYear)
-				.le(StrUtil.isNotEmpty(queryDTO.getQueryType())&&StrUtil.equals(queryDTO.getQueryType(),"3"),CurrentOverdue::getContractExpirTime,endOfYear)
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()),BusinessCustomer::getAreaId,queryDTO.getQueryArea())
-				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()),BusinessCustomer::getExportServiceAttr,queryDTO.getQueryServiceAttr())
-				.orderByDesc(CurrentOverdue::getCreateTime)
-				;
-		return R.ok(currentOverdueMapper.selectJoinList(HomeOverdueVo.class,wrapper));
+				.selectAs(BusinessCustomer::getCompanyName, "busGuestName")
+				.leftJoin(BusinessCustomer.class, BusinessCustomer::getId, CurrentOverdue::getBusGuestId)
+				.leftJoin(Contract.class, Contract::getId, CurrentOverdue::getContractId)
+				.eq(ObjUtil.isNotNull(queryDTO.getQueryCompId()), Contract::getCompId, queryDTO.getQueryCompId())
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), CurrentOverdue::getContractExpirTime, startOfDay)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "1"), CurrentOverdue::getContractExpirTime, endOfDay)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), CurrentOverdue::getContractExpirTime, startOfMonth)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "2"), CurrentOverdue::getContractExpirTime, endOfMonth)
+				.ge(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), CurrentOverdue::getContractExpirTime, startOfYear)
+				.le(StrUtil.isNotEmpty(queryDTO.getQueryType()) && StrUtil.equals(queryDTO.getQueryType(), "3"), CurrentOverdue::getContractExpirTime, endOfYear)
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryArea()), BusinessCustomer::getAreaId, queryDTO.getQueryArea())
+				.eq(StrUtil.isNotEmpty(queryDTO.getQueryServiceAttr()), BusinessCustomer::getExportServiceAttr, queryDTO.getQueryServiceAttr())
+				.orderByDesc(CurrentOverdue::getCreateTime);
+		return R.ok(currentOverdueMapper.selectJoinList(HomeOverdueVo.class, wrapper));
 	}
 
 	@Override
 	public R homeOverdueHis(HomeQueryDTO queryDTO) {
 		List<HomeOverdueStaVo> homeOverdueVos = new ArrayList<>();
 		HomeOverdueStaVo current = currentOverdueMapper.selectCurrentOverdue(queryDTO);
-		if (ObjUtil.isNotNull(current)){
+		if (ObjUtil.isNotNull(current)) {
 			current.setOverdueType("褰撳墠");
 			homeOverdueVos.add(current);
 		}
 		HomeOverdueStaVo history = historyOverdueMapper.selectHistoryOverdue(queryDTO);
-		if (ObjUtil.isNotNull(history)){
+		if (ObjUtil.isNotNull(history)) {
 			history.setOverdueType("鍘嗗彶");
 			homeOverdueVos.add(history);
 		}
@@ -1333,14 +1601,14 @@
 	public R homeZgsColum() {
 		R<List<SysDictItem>> r = remoteDictService.getDictByType("province");
 		List<SysDictItem> items = r.getData();
-		if (CollUtil.isEmpty(items)){
+		if (CollUtil.isEmpty(items)) {
 			return R.failed("瀹㈠晢鐪佷唤瀛楀吀鍒嗙被鑾峰彇寮傚父");
 		}
 		List<HomeZgsData> list = new ArrayList<>();
 		List<String> contractProvinces = contractMapper.homeZgsColum(SecurityUtils.getUser().getCompId());
-		if (CollUtil.isNotEmpty(contractProvinces)){
-			contractProvinces.stream().forEach(province->{
-				HomeZgsData homeZgsData = contractInvoiceMapper.homeZgsData(SecurityUtils.getUser().getCompId(),province);
+		if (CollUtil.isNotEmpty(contractProvinces)) {
+			contractProvinces.stream().forEach(province -> {
+				HomeZgsData homeZgsData = contractInvoiceMapper.homeZgsData(SecurityUtils.getUser().getCompId(), province);
 				if (ObjUtil.isNotNull(homeZgsData)) {
 					SysDictItem result = items.stream()
 							.filter(item -> item != null && province.equals(item.getItemValue()))
@@ -1362,47 +1630,47 @@
 	@Override
 	public R zbjtStatistic() {
 		List<ZbjtStatisticVo> statisticVoList = new ArrayList<>();
-		String curYear = DateUtil.year(new Date())+"";
-		String curMonth = DateUtil.month(new Date())+"";
+		String curYear = DateUtil.year(new Date()) + "";
+		String curMonth = DateUtil.month(new Date()) + "";
 		//鍚堝悓
 		ZbjtStatisticVo htVo = contractMapper.zbjtStatisticByContract();
-		AnnualPlanTotalVo planListHt = annualPlanMapper.selectPlanYear(curYear,"1");
-		if (ObjUtil.isNotNull(htVo)&&ObjUtil.isNotNull(planListHt)){
+		AnnualPlanTotalVo planListHt = annualPlanMapper.selectPlanYear(curYear, "1");
+		if (ObjUtil.isNotNull(htVo) && ObjUtil.isNotNull(planListHt)) {
 			BigDecimal monAmount = planListHt.getMonthAmount(curMonth);
-			if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-				htVo.setBmwc(new BigDecimal(htVo.getBm()).multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+			if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+				htVo.setBmwc(new BigDecimal(htVo.getBm()).multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 			}
 			BigDecimal yearAmount = planListHt.getTotalAmount();
-			if (ObjUtil.isNotNull(yearAmount)&&yearAmount.compareTo(new BigDecimal("0"))>0){
-				htVo.setBnwc(new BigDecimal(htVo.getBn()).multiply(new BigDecimal("100")).divide(yearAmount,2,RoundingMode.HALF_UP)+"%");
+			if (ObjUtil.isNotNull(yearAmount) && yearAmount.compareTo(new BigDecimal("0")) > 0) {
+				htVo.setBnwc(new BigDecimal(htVo.getBn()).multiply(new BigDecimal("100")).divide(yearAmount, 2, RoundingMode.HALF_UP) + "%");
 			}
 		}
 		statisticVoList.add(htVo);
 		//寮�绁�
 		ZbjtStatisticVo kpVo = contractInvoiceMapper.zbjtStatisticByInvoice();
-		AnnualPlanTotalVo planListFP = annualPlanMapper.selectPlanYear(curYear,"2");
-		if (ObjUtil.isNotNull(kpVo)&&ObjUtil.isNotNull(planListFP)){
+		AnnualPlanTotalVo planListFP = annualPlanMapper.selectPlanYear(curYear, "2");
+		if (ObjUtil.isNotNull(kpVo) && ObjUtil.isNotNull(planListFP)) {
 			BigDecimal monAmount = planListFP.getMonthAmount(curMonth);
-			if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-				kpVo.setBmwc(new BigDecimal(kpVo.getBm()).multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+			if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+				kpVo.setBmwc(new BigDecimal(kpVo.getBm()).multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 			}
 			BigDecimal yearAmount = planListFP.getTotalAmount();
-			if (ObjUtil.isNotNull(yearAmount)&&yearAmount.compareTo(new BigDecimal("0"))>0){
-				kpVo.setBnwc(new BigDecimal(kpVo.getBn()).multiply(new BigDecimal("100")).divide(yearAmount,2,RoundingMode.HALF_UP)+"%");
+			if (ObjUtil.isNotNull(yearAmount) && yearAmount.compareTo(new BigDecimal("0")) > 0) {
+				kpVo.setBnwc(new BigDecimal(kpVo.getBn()).multiply(new BigDecimal("100")).divide(yearAmount, 2, RoundingMode.HALF_UP) + "%");
 			}
 		}
 		statisticVoList.add(kpVo);
 		//鍥炴
 		ZbjtStatisticVo hkVo = paymentSlipMapper.zbjtStatisticByPayment();
-		AnnualPlanTotalVo planListHK = annualPlanMapper.selectPlanYear(curYear,"2");
-		if (ObjUtil.isNotNull(hkVo)&&ObjUtil.isNotNull(planListHK)){
+		AnnualPlanTotalVo planListHK = annualPlanMapper.selectPlanYear(curYear, "2");
+		if (ObjUtil.isNotNull(hkVo) && ObjUtil.isNotNull(planListHK)) {
 			BigDecimal monAmount = planListHK.getMonthAmount(curMonth);
-			if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-				hkVo.setBmwc(new BigDecimal(hkVo.getBm()).multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+			if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+				hkVo.setBmwc(new BigDecimal(hkVo.getBm()).multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 			}
 			BigDecimal yearAmount = planListHK.getTotalAmount();
-			if (ObjUtil.isNotNull(yearAmount)&&yearAmount.compareTo(new BigDecimal("0"))>0){
-				hkVo.setBnwc(new BigDecimal(hkVo.getBn()).multiply(new BigDecimal("100")).divide(yearAmount,2,RoundingMode.HALF_UP)+"%");
+			if (ObjUtil.isNotNull(yearAmount) && yearAmount.compareTo(new BigDecimal("0")) > 0) {
+				hkVo.setBnwc(new BigDecimal(hkVo.getBn()).multiply(new BigDecimal("100")).divide(yearAmount, 2, RoundingMode.HALF_UP) + "%");
 			}
 		}
 		statisticVoList.add(hkVo);
@@ -1413,15 +1681,15 @@
 	public R zbjtStatisticContractAmount() {
 		JSONObject jsonObject = new JSONObject();
 		ZbjtStatisticByContractAmountVo hte = contractMapper.zbjtStatisticByContractAmount();
-		jsonObject.put("hte",hte);
+		jsonObject.put("hte", hte);
 		ZbjtStatisticByContractAmountProVo htp = contractMapper.zbjtStatisticByContractAmountPro();
-		jsonObject.put("cpbk",htp);
+		jsonObject.put("cpbk", htp);
 		ZbjtStatisticByContractAmountClassVo sc = contractMapper.zbjtStatisticByContractAmountClass();
-		jsonObject.put("sczb",sc);
+		jsonObject.put("sczb", sc);
 		ZbjtStatisticByContractAmountSupplyVo yw = contractMapper.zbjtStatisticByContractAmountSupply();
-		jsonObject.put("ywzb",yw);
+		jsonObject.put("ywzb", yw);
 		ZbjtStatisticByContractAmountClassVo ys = contractMapper.zbjtStatisticByContractAmountYS();
-		jsonObject.put("yszb",ys);
+		jsonObject.put("yszb", ys);
 		return R.ok(jsonObject);
 	}
 
@@ -1429,48 +1697,48 @@
 	public R zbjtIndicatorTrend() {
 		JSONObject jsonObject = new JSONObject();
 		Integer curYear = DateUtil.year(new Date());
-		String startMon = (curYear-3)+"-01-01";
-		String endMon = curYear+"-12-01";
-		List<ZbjtIndicatorTrendVo> trendList = contractMapper.zbjtIndicatorTrend(startMon,endMon);
+		String startMon = (curYear - 3) + "-01-01";
+		String endMon = curYear + "-12-01";
+		List<ZbjtIndicatorTrendVo> trendList = contractMapper.zbjtIndicatorTrend(startMon, endMon);
 		JSONObject zbqs_ht = new JSONObject();
-		zbqs_ht.put((curYear-3)+"",trendList.stream().filter(item->item.getYearMon().startsWith((curYear-3)+"")).collect(Collectors.toList()));
-		zbqs_ht.put((curYear-2)+"",trendList.stream().filter(item->item.getYearMon().startsWith((curYear-2)+"")).collect(Collectors.toList()));
-		zbqs_ht.put((curYear-1)+"",trendList.stream().filter(item->item.getYearMon().startsWith((curYear-1)+"")).collect(Collectors.toList()));
-		zbqs_ht.put(curYear+"",trendList.stream().filter(item->item.getYearMon().startsWith(curYear+"")).collect(Collectors.toList()));
-		jsonObject.put("zbqs-ht",zbqs_ht);
-		List<ZbjtIndicatorTrendVo> trendInvoiceList = contractInvoiceMapper.zbjtIndicatorTrend(startMon,endMon);
+		zbqs_ht.put((curYear - 3) + "", trendList.stream().filter(item -> item.getYearMon().startsWith((curYear - 3) + "")).collect(Collectors.toList()));
+		zbqs_ht.put((curYear - 2) + "", trendList.stream().filter(item -> item.getYearMon().startsWith((curYear - 2) + "")).collect(Collectors.toList()));
+		zbqs_ht.put((curYear - 1) + "", trendList.stream().filter(item -> item.getYearMon().startsWith((curYear - 1) + "")).collect(Collectors.toList()));
+		zbqs_ht.put(curYear + "", trendList.stream().filter(item -> item.getYearMon().startsWith(curYear + "")).collect(Collectors.toList()));
+		jsonObject.put("zbqs-ht", zbqs_ht);
+		List<ZbjtIndicatorTrendVo> trendInvoiceList = contractInvoiceMapper.zbjtIndicatorTrend(startMon, endMon);
 		JSONObject zbqs_sr = new JSONObject();
-		zbqs_sr.put((curYear-3)+"",trendInvoiceList.stream().filter(item->item.getYearMon().startsWith((curYear-3)+"")).collect(Collectors.toList()));
-		zbqs_sr.put((curYear-2)+"",trendInvoiceList.stream().filter(item->item.getYearMon().startsWith((curYear-2)+"")).collect(Collectors.toList()));
-		zbqs_sr.put((curYear-1)+"",trendInvoiceList.stream().filter(item->item.getYearMon().startsWith((curYear-1)+"")).collect(Collectors.toList()));
-		zbqs_sr.put(curYear+"",trendInvoiceList.stream().filter(item->item.getYearMon().startsWith(curYear+"")).collect(Collectors.toList()));
-		jsonObject.put("zbqs-sr",zbqs_sr);
-		List<ZbjtIndicatorTrendVo> trendSlipList = paymentSlipMapper.zbjtIndicatorTrend(startMon,endMon);
+		zbqs_sr.put((curYear - 3) + "", trendInvoiceList.stream().filter(item -> item.getYearMon().startsWith((curYear - 3) + "")).collect(Collectors.toList()));
+		zbqs_sr.put((curYear - 2) + "", trendInvoiceList.stream().filter(item -> item.getYearMon().startsWith((curYear - 2) + "")).collect(Collectors.toList()));
+		zbqs_sr.put((curYear - 1) + "", trendInvoiceList.stream().filter(item -> item.getYearMon().startsWith((curYear - 1) + "")).collect(Collectors.toList()));
+		zbqs_sr.put(curYear + "", trendInvoiceList.stream().filter(item -> item.getYearMon().startsWith(curYear + "")).collect(Collectors.toList()));
+		jsonObject.put("zbqs-sr", zbqs_sr);
+		List<ZbjtIndicatorTrendVo> trendSlipList = paymentSlipMapper.zbjtIndicatorTrend(startMon, endMon);
 		JSONObject zbqs_hs = new JSONObject();
-		zbqs_hs.put((curYear-3)+"",trendSlipList.stream().filter(item->item.getYearMon().startsWith((curYear-3)+"")).collect(Collectors.toList()));
-		zbqs_hs.put((curYear-2)+"",trendSlipList.stream().filter(item->item.getYearMon().startsWith((curYear-2)+"")).collect(Collectors.toList()));
-		zbqs_hs.put((curYear-1)+"",trendSlipList.stream().filter(item->item.getYearMon().startsWith((curYear-1)+"")).collect(Collectors.toList()));
-		zbqs_hs.put(curYear+"",trendSlipList.stream().filter(item->item.getYearMon().startsWith(curYear+"")).collect(Collectors.toList()));
-		jsonObject.put("zbqs-hk",zbqs_hs);
+		zbqs_hs.put((curYear - 3) + "", trendSlipList.stream().filter(item -> item.getYearMon().startsWith((curYear - 3) + "")).collect(Collectors.toList()));
+		zbqs_hs.put((curYear - 2) + "", trendSlipList.stream().filter(item -> item.getYearMon().startsWith((curYear - 2) + "")).collect(Collectors.toList()));
+		zbqs_hs.put((curYear - 1) + "", trendSlipList.stream().filter(item -> item.getYearMon().startsWith((curYear - 1) + "")).collect(Collectors.toList()));
+		zbqs_hs.put(curYear + "", trendSlipList.stream().filter(item -> item.getYearMon().startsWith(curYear + "")).collect(Collectors.toList()));
+		jsonObject.put("zbqs-hk", zbqs_hs);
 		return R.ok(jsonObject);
 	}
 
 	@Override
 	public R zbjtPlanAchieced() {
-		String curYear = DateUtil.year(new Date())+"";
+		String curYear = DateUtil.year(new Date()) + "";
 		JSONObject jsonObject = new JSONObject();
 		JSONObject ht = new JSONObject();
-		AnnualPlanTotalVo planListHt = annualPlanMapper.selectPlanYear(curYear,"1");
+		AnnualPlanTotalVo planListHt = annualPlanMapper.selectPlanYear(curYear, "1");
 		List<ZbjtIndicatorTrendVo> trendVoList = contractMapper.zbjtPlanAchieced(null);
-		if (ObjUtil.isNotNull(planListHt)&&CollUtil.isNotEmpty(trendVoList)){
-			trendVoList.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHt) && CollUtil.isNotEmpty(trendVoList)) {
+			trendVoList.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHt.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		ht.put("zb",trendVoList);
+		ht.put("zb", trendVoList);
 		List<Long> compIds = new ArrayList<>();
 		compIds.add(2089995177814495234L);
 		compIds.add(2089996921978040321L);
@@ -1478,259 +1746,259 @@
 		compIds.add(2101966257365045249L);
 
 		AnnualPlan planListHtSMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.in(AnnualPlan::getCompId,compIds).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.in(AnnualPlan::getCompId, compIds).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> smjtrendVoList = contractMapper.zbjtPlanAchiecedSmj();
-		if (ObjUtil.isNotNull(planListHtSMJ)&&CollUtil.isNotEmpty(smjtrendVoList)){
-			smjtrendVoList.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHtSMJ) && CollUtil.isNotEmpty(smjtrendVoList)) {
+			smjtrendVoList.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHtSMJ.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		ht.put("smj",smjtrendVoList);
+		ht.put("smj", smjtrendVoList);
 		AnnualPlan planListHtSGB = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556196124250113L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556196124250113L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> sgbtrendVoList = contractMapper.zbjtPlanAchieced(2056556196124250113L);
-		if (ObjUtil.isNotNull(planListHtSGB)&&CollUtil.isNotEmpty(sgbtrendVoList)){
-			sgbtrendVoList.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHtSGB) && CollUtil.isNotEmpty(sgbtrendVoList)) {
+			sgbtrendVoList.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHtSGB.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		ht.put("sgb",sgbtrendVoList);
+		ht.put("sgb", sgbtrendVoList);
 		AnnualPlan planListHTfgs = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556421857497090L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556421857497090L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> tfgstrendVoList = contractMapper.zbjtPlanAchieced(2056556421857497090L);
-		if (ObjUtil.isNotNull(planListHTfgs)&&CollUtil.isNotEmpty(tfgstrendVoList)){
-			tfgstrendVoList.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHTfgs) && CollUtil.isNotEmpty(tfgstrendVoList)) {
+			tfgstrendVoList.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHTfgs.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		ht.put("tfgs",tfgstrendVoList);
+		ht.put("tfgs", tfgstrendVoList);
 		AnnualPlan planListHjxc = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556317461270529L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> jxctrendVoList = contractMapper.zbjtPlanAchieced(2056556317461270529L);
-		if (ObjUtil.isNotNull(planListHjxc)&&CollUtil.isNotEmpty(jxctrendVoList)){
-			jxctrendVoList.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHjxc) && CollUtil.isNotEmpty(jxctrendVoList)) {
+			jxctrendVoList.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHjxc.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		ht.put("jxc",jxctrendVoList);
+		ht.put("jxc", jxctrendVoList);
 		AnnualPlan planListHYMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556535640576002L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556535640576002L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> ymjtrendVoList = contractMapper.zbjtPlanAchieced(2056556535640576002L);
-		if (ObjUtil.isNotNull(planListHYMJ)&&CollUtil.isNotEmpty(ymjtrendVoList)){
-			ymjtrendVoList.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHYMJ) && CollUtil.isNotEmpty(ymjtrendVoList)) {
+			ymjtrendVoList.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHYMJ.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		ht.put("ymj",ymjtrendVoList);
-		jsonObject.put("ht",ht);
+		ht.put("ymj", ymjtrendVoList);
+		jsonObject.put("ht", ht);
 		JSONObject sr = new JSONObject();
-		AnnualPlanTotalVo planLisSR = annualPlanMapper.selectPlanYear(curYear,"1");
+		AnnualPlanTotalVo planLisSR = annualPlanMapper.selectPlanYear(curYear, "1");
 		List<ZbjtIndicatorTrendVo> trendVoList1 = contractInvoiceMapper.zbjtPlanAchieced(null);
-		if (ObjUtil.isNotNull(planLisSR)&&CollUtil.isNotEmpty(trendVoList1)){
-			trendVoList1.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planLisSR) && CollUtil.isNotEmpty(trendVoList1)) {
+			trendVoList1.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planLisSR.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		sr.put("zb",trendVoList1);
+		sr.put("zb", trendVoList1);
 
 		AnnualPlan planListSRSMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"2")
-				.in(AnnualPlan::getCompId,compIds).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "2")
+				.in(AnnualPlan::getCompId, compIds).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> smjtrendVoList1 = contractInvoiceMapper.zbjtPlanAchiecedSmj();
-		if (ObjUtil.isNotNull(planListSRSMJ)&&CollUtil.isNotEmpty(smjtrendVoList1)){
-			smjtrendVoList1.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListSRSMJ) && CollUtil.isNotEmpty(smjtrendVoList1)) {
+			smjtrendVoList1.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListSRSMJ.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		sr.put("smj",smjtrendVoList1);
+		sr.put("smj", smjtrendVoList1);
 		//鐭冲伐娉垫敹鍏�
 		AnnualPlan planListSRSGB = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556196124250113L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556196124250113L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> sgbtrendVoList1 = contractInvoiceMapper.zbjtPlanAchieced(2056556196124250113L);
-		if (ObjUtil.isNotNull(planListSRSGB)&&CollUtil.isNotEmpty(sgbtrendVoList1)){
-			sgbtrendVoList1.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListSRSGB) && CollUtil.isNotEmpty(sgbtrendVoList1)) {
+			sgbtrendVoList1.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListSRSGB.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		sr.put("sgb",sgbtrendVoList1);
+		sr.put("sgb", sgbtrendVoList1);
 		//閫氭柟鍏徃鏀跺叆
 		AnnualPlan planListSRTFGS = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556421857497090L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556421857497090L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> tfgstrendVoList1 = contractInvoiceMapper.zbjtPlanAchieced(2056556421857497090L);
 
-		if (ObjUtil.isNotNull(planListSRTFGS)&&CollUtil.isNotEmpty(tfgstrendVoList1)){
-			tfgstrendVoList1.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListSRTFGS) && CollUtil.isNotEmpty(tfgstrendVoList1)) {
+			tfgstrendVoList1.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListSRTFGS.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		sr.put("tfgs",tfgstrendVoList1);
+		sr.put("tfgs", tfgstrendVoList1);
 		//鏈烘鍘傛敹鍏�
 		AnnualPlan planListSRJXC = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556317461270529L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> jxctrendVoList1 = contractInvoiceMapper.zbjtPlanAchieced(2056556317461270529L);
 
 
-		if (ObjUtil.isNotNull(planListSRJXC)&&CollUtil.isNotEmpty(jxctrendVoList1)){
-			jxctrendVoList1.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListSRJXC) && CollUtil.isNotEmpty(jxctrendVoList1)) {
+			jxctrendVoList1.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListSRJXC.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		sr.put("jxc",jxctrendVoList1);
+		sr.put("jxc", jxctrendVoList1);
 		//涓�鐓ゆ満鏀跺叆
 		AnnualPlan planListSRYMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556317461270529L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> ymjtrendVoList1 = contractInvoiceMapper.zbjtPlanAchieced(2056556535640576002L);
 
 
-		if (ObjUtil.isNotNull(planListSRYMJ)&&CollUtil.isNotEmpty(ymjtrendVoList1)){
-			ymjtrendVoList1.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListSRYMJ) && CollUtil.isNotEmpty(ymjtrendVoList1)) {
+			ymjtrendVoList1.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListSRYMJ.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		sr.put("ymj",ymjtrendVoList1);
-		jsonObject.put("sr",sr);
+		sr.put("ymj", ymjtrendVoList1);
+		jsonObject.put("sr", sr);
 
 		JSONObject hk = new JSONObject();
 		//鍥炴
-		AnnualPlanTotalVo planLisHK = annualPlanMapper.selectPlanYear(curYear,"1");
+		AnnualPlanTotalVo planLisHK = annualPlanMapper.selectPlanYear(curYear, "1");
 		List<ZbjtIndicatorTrendVo> trendVoList2 = paymentSlipMapper.zbjtPlanAchieced(null);
-		if (ObjUtil.isNotNull(planLisHK)&&CollUtil.isNotEmpty(trendVoList2)){
-			trendVoList2.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planLisHK) && CollUtil.isNotEmpty(trendVoList2)) {
+			trendVoList2.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planLisHK.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
-		hk.put("zb",trendVoList2);
+		hk.put("zb", trendVoList2);
 		//鐭崇叅鏈哄洖娆�
 		AnnualPlan planListHKSMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"2")
-				.in(AnnualPlan::getCompId,compIds).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "2")
+				.in(AnnualPlan::getCompId, compIds).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> smjtrendVoList2 = paymentSlipMapper.zbjtPlanAchiecedSmj();
-		if (ObjUtil.isNotNull(planListHKSMJ)&&CollUtil.isNotEmpty(smjtrendVoList2)){
-			smjtrendVoList2.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHKSMJ) && CollUtil.isNotEmpty(smjtrendVoList2)) {
+			smjtrendVoList2.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHKSMJ.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		hk.put("smj",smjtrendVoList2);
+		hk.put("smj", smjtrendVoList2);
 		//鐭冲伐娉靛洖娆�
 		AnnualPlan planListHKSGB = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556196124250113L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556196124250113L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> sgbtrendVoList2 = paymentSlipMapper.zbjtPlanAchieced(2056556196124250113L);
 
 
-		if (ObjUtil.isNotNull(planListHKSGB)&&CollUtil.isNotEmpty(sgbtrendVoList2)){
-			sgbtrendVoList2.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHKSGB) && CollUtil.isNotEmpty(sgbtrendVoList2)) {
+			sgbtrendVoList2.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHKSGB.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		hk.put("sgb",sgbtrendVoList2);
+		hk.put("sgb", sgbtrendVoList2);
 		//tfgs鍥炴
 		AnnualPlan planListHKTFGS = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556421857497090L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556421857497090L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> tfgstrendVoList2 = paymentSlipMapper.zbjtPlanAchieced(2056556421857497090L);
 
-		if (ObjUtil.isNotNull(planListHKTFGS)&&CollUtil.isNotEmpty(tfgstrendVoList2)){
-			tfgstrendVoList2.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHKTFGS) && CollUtil.isNotEmpty(tfgstrendVoList2)) {
+			tfgstrendVoList2.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHKTFGS.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		hk.put("tfgs",tfgstrendVoList2);
+		hk.put("tfgs", tfgstrendVoList2);
 		//鏈烘鍘傚洖娆�
 		AnnualPlan planListHKJXC = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556317461270529L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> jxctrendVoList2 = paymentSlipMapper.zbjtPlanAchieced(2056556317461270529L);
 
-		if (ObjUtil.isNotNull(planListHKJXC)&&CollUtil.isNotEmpty(jxctrendVoList2)){
-			jxctrendVoList2.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHKJXC) && CollUtil.isNotEmpty(jxctrendVoList2)) {
+			jxctrendVoList2.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHKJXC.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
 
-		hk.put("jxc",jxctrendVoList2);
+		hk.put("jxc", jxctrendVoList2);
 		//涓�鐓ゆ満鍥炴
 		AnnualPlan planListHKYMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
-				.eq(AnnualPlan::getPlanYear,curYear).eq(AnnualPlan::getPlanType,"1")
-				.eq(AnnualPlan::getCompId,2056556535640576002L).last("limit 1"));
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, "1")
+				.eq(AnnualPlan::getCompId, 2056556535640576002L).last("limit 1"));
 		List<ZbjtIndicatorTrendVo> ymjtrendVoList2 = paymentSlipMapper.zbjtPlanAchieced(2056556535640576002L);
 
-		if (ObjUtil.isNotNull(planListHKYMJ)&&CollUtil.isNotEmpty(ymjtrendVoList2)){
-			ymjtrendVoList2.stream().forEach(trendVo->{
+		if (ObjUtil.isNotNull(planListHKYMJ) && CollUtil.isNotEmpty(ymjtrendVoList2)) {
+			ymjtrendVoList2.stream().forEach(trendVo -> {
 				BigDecimal monAmount = planListHKYMJ.getMonthAmount(trendVo.getYearMon());
-				if (ObjUtil.isNotNull(monAmount)&&monAmount.compareTo(new BigDecimal("0"))>0){
-					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount,2,RoundingMode.HALF_UP)+"%");
+				if (ObjUtil.isNotNull(monAmount) && monAmount.compareTo(new BigDecimal("0")) > 0) {
+					trendVo.setWc(trendVo.getJe().multiply(new BigDecimal("100")).divide(monAmount, 2, RoundingMode.HALF_UP) + "%");
 				}
 			});
 		}
 
-		hk.put("ymj",ymjtrendVoList2);
-		jsonObject.put("hk",hk);
+		hk.put("ymj", ymjtrendVoList2);
+		jsonObject.put("hk", hk);
 		return R.ok(jsonObject);
 	}
 
@@ -1740,7 +2008,7 @@
 		JSONObject hk = new JSONObject();
 		//鍥炴
 		List<ZbjtIndicatorTrendVo> trendVoList = paymentReceiveMapper.zbjtReceiveScale(null);
-		hk.put("zb",trendVoList);
+		hk.put("zb", trendVoList);
 		//鐭崇叅鏈哄洖娆�
 
 		List<Long> compIds = new ArrayList<>();
@@ -1750,20 +2018,20 @@
 		compIds.add(2101966257365045249L);
 
 		List<ZbjtIndicatorTrendVo> trendVoListSMJ = paymentReceiveMapper.zbjtReceiveScaleSMJ();
-		hk.put("smj",trendVoListSMJ);
+		hk.put("smj", trendVoListSMJ);
 		//鐭冲伐娉靛洖娆�
 		List<ZbjtIndicatorTrendVo> trendVoListSGB = paymentReceiveMapper.zbjtReceiveScale(2056556196124250113L);
 
-		hk.put("sgb",trendVoListSGB);
+		hk.put("sgb", trendVoListSGB);
 		//tfgs
 		List<ZbjtIndicatorTrendVo> trendVoListTFGS = paymentReceiveMapper.zbjtReceiveScale(2056556421857497090L);
-		hk.put("tfgs",trendVoListTFGS);
+		hk.put("tfgs", trendVoListTFGS);
 		//鏈烘鍘傚洖娆�
 		List<ZbjtIndicatorTrendVo> trendVoListJXC = paymentReceiveMapper.zbjtReceiveScale(2056556317461270529L);
-		hk.put("jxc",trendVoListJXC);
+		hk.put("jxc", trendVoListJXC);
 		//涓�鐓ゆ満鍥炴
 		List<ZbjtIndicatorTrendVo> trendVoListYMJ = paymentReceiveMapper.zbjtReceiveScale(2056556535640576002L);
-		hk.put("ymj",trendVoListYMJ);
+		hk.put("ymj", trendVoListYMJ);
 		return R.ok(hk);
 	}
 }
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ZBJTStatisticServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ZBJTStatisticServiceImpl.java
new file mode 100644
index 0000000..4fea444
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ZBJTStatisticServiceImpl.java
@@ -0,0 +1,1368 @@
+package com.by4cloud.platformx.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.by4cloud.platformx.business.dto.ZBJTStatisticDTO;
+import com.by4cloud.platformx.business.entity.AnnualPlan;
+import com.by4cloud.platformx.business.entity.AnnualPlanKey;
+import com.by4cloud.platformx.business.entity.AnnualTarget;
+import com.by4cloud.platformx.business.entity.BipDict;
+import com.by4cloud.platformx.business.mapper.*;
+import com.by4cloud.platformx.business.service.ZBJTStatisticService;
+import com.by4cloud.platformx.business.vo.*;
+import com.by4cloud.platformx.common.core.util.R;
+import lombok.RequiredArgsConstructor;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class ZBJTStatisticServiceImpl implements ZBJTStatisticService {
+
+	private final ContractMapper contractMapper;
+	private final PaymentSlipMapper paymentSlipMapper;
+	private final ContractInvoiceMapper contractInvoiceMapper;
+	private final AnnualPlanMapper annualPlanMapper;
+	private final AnnualPlanKeyMapper annualPlanKeyMapper;
+	private final AnnualTargetMapper annualTargetMapper;
+	private final ContractSubjectMatterMapper contractSubjectMatterMapper;
+	private final ContractOutBoundMapper contractOutBoundMapper;
+	private final BipDictMapper bipDictMapper;
+	private final PaymentReceiveMapper paymentReceiveMapper;
+	private final HistoryOverdueMapper historyOverdueMapper;
+
+	@Override
+	public R zyxszbwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		List<ZyxszbwcqkVo> list = new ArrayList<>();
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+
+		HomeZbjtVo hk = paymentSlipMapper.homeZbjtYearAndMon(monstart,monend,yearstart,yearend,
+				monstartLastYear,monendLastYear,yearstartLastYear,yearendLastYear);
+		list = handlezBJTVo("璐ф鍥炴敹",list,hk,queryDTO.getYearMonth().substring(0,4), queryDTO.getYearMonth().substring(5), "3");
+
+		HomeZbjtVo kp = contractInvoiceMapper.homeZbjtYearAndMon(monstart,monend,yearstart,yearend);
+
+		list = handlezBJTVo("閿�鍞敹鍏�",list,kp,queryDTO.getYearMonth().substring(0,4), queryDTO.getYearMonth().substring(5), "2");
+
+		HomeZbjtVo htqd = contractMapper.homeZbjtYearAndMon(monstart,monend,yearstart,yearend);
+
+		list = handlezBJTVo("鏂板鍚堝悓",list,htqd,queryDTO.getYearMonth().substring(0,4), queryDTO.getYearMonth().substring(5), "1");
+		return R.ok(list);
+	}
+
+	private List<ZyxszbwcqkVo> handlezBJTVo(String xm,List<ZyxszbwcqkVo> list, HomeZbjtVo kp,String curYear,String curMonth,String planType) {
+		ZyxszbwcqkVo vosmj = new ZyxszbwcqkVo();
+		vosmj.setXm(xm);
+		vosmj.setDw("鐭崇叅鏈�");
+		ZyxszbwcqkVo vosgb = new ZyxszbwcqkVo();
+		vosgb.setXm(xm);
+		vosgb.setDw("鐭冲伐娉�");
+		ZyxszbwcqkVo vojxc = new ZyxszbwcqkVo();
+		vojxc.setXm(xm);
+		vojxc.setDw("閭㈠彴鍘�");
+		ZyxszbwcqkVo votf = new ZyxszbwcqkVo();
+		votf.setXm(xm);
+		votf.setDw("閫氭柟鍘�");
+		ZyxszbwcqkVo voymj = new ZyxszbwcqkVo();
+		voymj.setXm(xm);
+		voymj.setDw("涓�鐓ゆ満");
+		ZyxszbwcqkVo vozb = new ZyxszbwcqkVo();
+		vozb.setXm(xm);
+		vozb.setDw("瑁呭闆嗗洟");
+		List<Long> compIds = new ArrayList<>();
+		compIds.add(2089995177814495234L);
+		compIds.add(2089996921978040321L);
+		compIds.add(2089997578009128962L);
+		compIds.add(2101966257365045249L);
+		//瑁呭
+		vosmj.setDrwc(kp.safeAddAll(kp.getSmjbr(),kp.getSgbbr(),kp.getJxcbr(),kp.getTfbr(),null));
+		AnnualPlanTotalVo planListZB = annualPlanMapper.selectPlanYear(curYear, planType);
+		if (ObjUtil.isNotNull(planListZB)) {
+			AnnualPlanTotalVo planzb = BeanUtil.copyProperties(planListZB, AnnualPlanTotalVo.class);
+			BigDecimal curMonAmount = planzb.getMonthAmount(curMonth);
+			vozb.setDyjh(curMonAmount);
+			vozb.setDywc(kp.safeAddAll(kp.getSmjby(),kp.getSgbby(),kp.getJxcby(),kp.getTfby(),null));
+			if (vozb.getDyjh().compareTo(new BigDecimal("0")) > 0) {
+				vozb.setYjhwc(vozb.getDywc().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			BigDecimal qnby = kp.safeAddAll(kp.getSmjqnby(),kp.getSgbqnby(),kp.getJxcqnby(),kp.getTfqnby(),null);
+			BigDecimal qnbytb = vozb.getDywc().subtract(qnby);
+			if (qnby.compareTo(new BigDecimal("0"))>0){
+				BigDecimal qnbytqb = qnbytb.divide(qnby,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vozb.setYtqb(qnbytqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+
+			vozb.setNdjh(planzb.getTotalAmount());
+			BigDecimal yearAmount = planzb.getTotalAmount();
+			vozb.setLjjh(planzb.getToMonTotalAmount(curMonth));
+			vozb.setLjwc(kp.safeAddAll(kp.getSmjbn(),kp.getSgbbn(),kp.getJxcbn(),kp.getTfbn(),null));
+			if (vozb.getLjjh().compareTo(new BigDecimal("0")) > 0) {
+				vozb.setNjhwc(vozb.getLjwc().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			BigDecimal qnbn = kp.safeAddAll(kp.getSmjqnbn(),kp.getSgbqnbn(),kp.getJxcqnbn(),kp.getTfqnbn(),null);
+			BigDecimal qnbntb = vozb.getLjwc().subtract(qnby);
+			if (qnbn.compareTo(new BigDecimal("0"))>0){
+				BigDecimal qnbntqb = qnbntb.divide(qnbn,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vozb.setYtqb(qnbntqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+		}
+		//鐭崇叅鏈烘敹鍏�
+		AnnualPlan planListSMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+				.in(AnnualPlan::getCompId, compIds).last("limit 1"));
+		vosmj.setDrwc(kp.getSmjbr());
+		if (ObjUtil.isNotNull(planListSMJ)) {
+
+			AnnualPlanTotalVo plansmj = BeanUtil.copyProperties(planListSMJ, AnnualPlanTotalVo.class);
+			BigDecimal curMonAmount = plansmj.getMonthAmount(curMonth);
+			vosmj.setDyjh(curMonAmount);
+			if (ObjUtil.isNotNull(kp.getSmjby()) && kp.getSmjby().compareTo(new BigDecimal("0")) > 0) {
+				vosmj.setDywc(kp.getSmjby());
+				vosmj.setYjhwc(kp.getSmjby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnby())&& kp.getSmjqnby().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = vosmj.getDywc().subtract(kp.getSmjqnby());
+				BigDecimal tqb = tb.divide(kp.getSmjqnby(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vosmj.setYtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+			vosmj.setNdjh(plansmj.getTotalAmount());
+			BigDecimal yearAmount = plansmj.getTotalAmount();
+			vosmj.setLjjh(plansmj.getToMonTotalAmount(curMonth));
+			vosmj.setLjwc(kp.getSmjbn());
+			if (ObjUtil.isNotNull(kp.getSmjbn()) && kp.getSmjbn().compareTo(new BigDecimal("0")) > 0) {
+				vosmj.setNjhwc(kp.getSmjbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnbn())&& kp.getSmjqnbn().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = vosmj.getLjwc().subtract(kp.getSmjqnbn());
+				BigDecimal tqb = tb.divide(kp.getSmjqnbn(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vosmj.setNtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+		}
+		//鐭冲伐娉垫敹鍏�
+		vosgb.setDrwc(kp.getSgbbr());
+		AnnualPlan planListSRSGB = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+				.eq(AnnualPlan::getCompId, 2056556196124250113L).last("limit 1"));
+		if (ObjUtil.isNotNull(planListSRSGB)) {
+			AnnualPlanTotalVo plansgb = BeanUtil.copyProperties(planListSRSGB, AnnualPlanTotalVo.class);
+			BigDecimal curMonAmount = plansgb.getMonthAmount(curMonth);
+			vosgb.setDyjh(curMonAmount);
+			if (ObjUtil.isNotNull(kp.getSgbby()) && kp.getSgbby().compareTo(new BigDecimal("0")) > 0) {
+				vosgb.setDywc(kp.getSgbby());
+				vosgb.setYjhwc(kp.getSgbby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnby())&& kp.getSmjqnby().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = vosgb.getDywc().subtract(kp.getSmjqnby());
+				BigDecimal tqb = tb.divide(kp.getSmjqnby(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vosgb.setYtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+			vosgb.setNdjh(plansgb.getTotalAmount());
+			BigDecimal yearAmount = plansgb.getTotalAmount();
+			vosgb.setLjjh(plansgb.getToMonTotalAmount(curMonth));
+			vosgb.setLjwc(kp.getSgbbn());
+			if (ObjUtil.isNotNull(kp.getSgbbn()) && kp.getSgbbn().compareTo(new BigDecimal("0")) > 0) {
+				vosgb.setNjhwc(kp.getSgbbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnbn())&& kp.getSmjqnbn().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = vosgb.getLjwc().subtract(kp.getSmjqnbn());
+				BigDecimal tqb = tb.divide(kp.getSmjqnbn(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vosgb.setNtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+		}
+		//閫氭柟鍏徃鏀跺叆
+		votf.setDrwc(kp.getTfbr());
+		AnnualPlan planListSRTFGS = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+				.eq(AnnualPlan::getCompId, 2056556421857497090L).last("limit 1"));
+		if (ObjUtil.isNotNull(planListSRTFGS)) {
+			AnnualPlanTotalVo plantf = BeanUtil.copyProperties(planListSRTFGS, AnnualPlanTotalVo.class);
+			BigDecimal curMonAmount = plantf.getMonthAmount(curMonth);
+			votf.setDyjh(curMonAmount);
+			if (ObjUtil.isNotNull(kp.getTfby()) && kp.getTfby().compareTo(new BigDecimal("0")) > 0) {
+				votf.setDywc(kp.getTfby());
+				votf.setYjhwc(kp.getTfby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnby())&& kp.getSmjqnby().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = votf.getDywc().subtract(kp.getSmjqnby());
+				BigDecimal tqb = tb.divide(kp.getSmjqnby(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				votf.setYtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+			votf.setNdjh(plantf.getTotalAmount());
+			BigDecimal yearAmount = plantf.getTotalAmount();
+			votf.setLjjh(plantf.getToMonTotalAmount(curMonth));
+			votf.setLjwc(kp.getTfbn());
+			if (ObjUtil.isNotNull(kp.getTfbn()) && kp.getTfbn().compareTo(new BigDecimal("0")) > 0) {
+				votf.setNjhwc(kp.getTfbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnbn())&& kp.getSmjqnbn().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = votf.getLjwc().subtract(kp.getSmjqnbn());
+				BigDecimal tqb = tb.divide(kp.getSmjqnbn(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				votf.setNtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+		}
+		//鏈烘鍘傛敹鍏�
+		vojxc.setDrwc(kp.getJxcbr());
+		AnnualPlan planListSRJXC = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+				.eq(AnnualPlan::getCompId, 2056556317461270529L).last("limit 1"));
+		if (ObjUtil.isNotNull(planListSRJXC)) {
+			AnnualPlanTotalVo planjxc = BeanUtil.copyProperties(planListSRJXC, AnnualPlanTotalVo.class);
+			BigDecimal curMonAmount = planjxc.getMonthAmount(curMonth);
+			vojxc.setDyjh(curMonAmount);
+			if (ObjUtil.isNotNull(kp.getJxcby()) && kp.getJxcby().compareTo(new BigDecimal("0")) > 0) {
+				vojxc.setDywc(kp.getJxcby());
+				vojxc.setYjhwc(kp.getJxcby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnby())&& kp.getSmjqnby().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = vojxc.getDywc().subtract(kp.getSmjqnby());
+				BigDecimal tqb = tb.divide(kp.getSmjqnby(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vojxc.setYtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+			vojxc.setNdjh(planjxc.getTotalAmount());
+			BigDecimal yearAmount = planjxc.getTotalAmount();
+			vojxc.setLjjh(planjxc.getToMonTotalAmount(curMonth));
+			vojxc.setLjwc(kp.getJxcbn());
+			if (ObjUtil.isNotNull(kp.getJxcbn()) && kp.getJxcbn().compareTo(new BigDecimal("0")) > 0) {
+				vojxc.setNjhwc(kp.getJxcbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnbn())&& kp.getSmjqnbn().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = vojxc.getLjwc().subtract(kp.getSmjqnbn());
+				BigDecimal tqb = tb.divide(kp.getSmjqnbn(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				vojxc.setNtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+		}
+		//涓�鐓ゆ満鏀跺叆
+		voymj.setDrwc(kp.getYmjbr());
+		AnnualPlan planListHYMJ = annualPlanMapper.selectOne(Wrappers.<AnnualPlan>lambdaQuery()
+				.eq(AnnualPlan::getPlanYear, curYear).eq(AnnualPlan::getPlanType, planType)
+				.eq(AnnualPlan::getCompId, 2056556535640576002L).last("limit 1"));
+		if (ObjUtil.isNotNull(planListHYMJ)) {
+			AnnualPlanTotalVo planymj = BeanUtil.copyProperties(planListHYMJ, AnnualPlanTotalVo.class);
+			BigDecimal curMonAmount = planymj.getMonthAmount(curMonth);
+			voymj.setDyjh(curMonAmount);
+			if (ObjUtil.isNotNull(kp.getYmjby()) && kp.getYmjby().compareTo(new BigDecimal("0")) > 0) {
+				voymj.setDywc(kp.getYmjby());
+				voymj.setYjhwc(kp.getYmjby().divide(curMonAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnby())&& kp.getSmjqnby().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = voymj.getDywc().subtract(kp.getSmjqnby());
+				BigDecimal tqb = tb.divide(kp.getSmjqnby(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				voymj.setYtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+			voymj.setNdjh(planymj.getTotalAmount());
+			BigDecimal yearAmount = planymj.getTotalAmount();
+			voymj.setLjjh(planymj.getToMonTotalAmount(curMonth));
+			voymj.setLjwc(kp.getYmjbn());
+			if (ObjUtil.isNotNull(kp.getYmjbn()) && kp.getYmjbn().compareTo(new BigDecimal("0")) > 0) {
+				voymj.setNjhwc(kp.getYmjbn().divide(yearAmount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			if (ObjUtil.isNotNull(kp.getSmjqnbn())&& kp.getSmjqnbn().compareTo(new BigDecimal("0")) > 0){
+				BigDecimal tb = voymj.getLjwc().subtract(kp.getSmjqnbn());
+				BigDecimal tqb = tb.divide(kp.getSmjqnbn(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+				voymj.setNtqb(tqb.setScale(2,RoundingMode.HALF_UP)+"%");
+			}
+		}
+		list.add(vosmj);
+		list.add(vosgb);
+		list.add(vojxc);
+		list.add(votf);
+		list.add(voymj);
+		list.add(vozb);
+		return list;
+	}
+
+	@Override
+	public R yszkwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastMon = DateUtil.offsetMonth(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastMon = DateUtil.offsetMonth(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(Integer.valueOf(queryDTO.getYearMonth().substring(0,4))-1+"-12-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(Integer.valueOf(queryDTO.getYearMonth().substring(0,4))-1+"-12-31 23:59:59");
+
+		List<YszkwcqkVo> list = paymentReceiveMapper.yszkwcqk(monstart,monend,yearstart,yearend,monstartLastMon,monendLastMon);
+		if(CollUtil.isNotEmpty(list)){
+			list.stream().forEach(item->{
+				item.setQctq(item.getYsdy().subtract(item.getYsqc()));
+				item.setSyhb(item.getYsdy().subtract(item.getYssy()));
+			});
+		}
+		YszkwcqkVo jtys = new YszkwcqkVo();
+		jtys.setDw("闆嗗洟");
+		jtys.setLb("搴旀敹");
+		jtys.setYsdy(list.stream().filter(item->item.getLb().equals("搴旀敹")).map(YszkwcqkVo::getYsdy).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtys.setYsqc(list.stream().filter(item->item.getLb().equals("搴旀敹")).map(YszkwcqkVo::getYsqc).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtys.setYssy(list.stream().filter(item->item.getLb().equals("搴旀敹")).map(YszkwcqkVo::getYssy).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtys.setQctq(jtys.getYsdy().subtract(jtys.getYsqc()));
+		jtys.setSyhb(jtys.getYsdy().subtract(jtys.getYssy()));
+		YszkwcqkVo jtsx = new YszkwcqkVo();
+		jtsx.setDw("闆嗗洟");
+		jtsx.setLb("璧婇攢");
+		jtsx.setYsdy(list.stream().filter(item->item.getLb().equals("璧婇攢")).map(YszkwcqkVo::getYsdy).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtsx.setYsqc(list.stream().filter(item->item.getLb().equals("璧婇攢")).map(YszkwcqkVo::getYsqc).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtsx.setYssy(list.stream().filter(item->item.getLb().equals("璧婇攢")).map(YszkwcqkVo::getYssy).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtsx.setQctq(jtys.getYsdy().subtract(jtys.getYsqc()));
+		jtsx.setSyhb(jtys.getYsdy().subtract(jtys.getYssy()));
+		YszkwcqkVo jtxj = new YszkwcqkVo();
+		jtxj.setDw("闆嗗洟");
+		jtxj.setLb("灏忚");
+		jtxj.setYsdy(list.stream().filter(item->item.getLb().equals("灏忚")).map(YszkwcqkVo::getYsdy).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtxj.setYsqc(list.stream().filter(item->item.getLb().equals("灏忚")).map(YszkwcqkVo::getYsqc).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtxj.setYssy(list.stream().filter(item->item.getLb().equals("灏忚")).map(YszkwcqkVo::getYssy).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+		jtxj.setQctq(jtys.getYsdy().subtract(jtys.getYsqc()));
+		jtxj.setSyhb(jtys.getYsdy().subtract(jtys.getYssy()));
+		list.add(jtys);
+		list.add(jtsx);
+		list.add(jtxj);
+		return R.ok(list);
+	}
+
+	@Override
+	public R gcpbkwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		List<GcpbkwcqkVo> list = new ArrayList<>();
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		//鏂板鍚堝悓
+		List<GcpbkwcqkItemVo> itemVoListMon = contractSubjectMatterMapper.gcpbkwcqk(monstart,monend);
+		List<GcpbkwcqkItemVo> itemVoListMonLastYear = contractSubjectMatterMapper.gcpbkwcqk(monstartLastYear,monendLastYear);
+		if (CollUtil.isNotEmpty(itemVoListMon)){
+			itemVoListMon.stream().forEach(item->{
+				GcpbkwcqkVo vo = new GcpbkwcqkVo();
+				vo.setXm("鏂板鍚堝悓");
+				vo.setBkmc(item.getBkmc());
+				vo.setDywc(item.getWc());
+				if (CollUtil.isNotEmpty(itemVoListMonLastYear)){
+					itemVoListMonLastYear.stream().forEach(item1->{
+						if (StrUtil.equals(vo.getBkmc(),item1.getBkmc())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+							BigDecimal percent = vo.getDywc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+							vo.setYtqb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+						}
+					});
+				}
+				list.add(vo);
+			});
+		}
+		List<GcpbkwcqkItemVo> itemVoListYear = contractSubjectMatterMapper.gcpbkwcqk(yearstart,yearend);
+		List<GcpbkwcqkItemVo> itemVoListYearLastYear = contractSubjectMatterMapper.gcpbkwcqk(yearstartLastYear,yearendLastYear);
+		if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYear)){
+			BigDecimal ljzh = itemVoListYear.stream().map(item->item.getWc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add);
+			for (GcpbkwcqkVo vo:list
+				 ) {
+				for (GcpbkwcqkItemVo itemVo:itemVoListYear
+				) {
+					if (StrUtil.equals(vo.getBkmc(),itemVo.getBkmc())&&StrUtil.equals(vo.getXm(),"鏂板鍚堝悓")){
+						vo.setLjwc(itemVo.getWc());
+						if (ljzh.compareTo(new BigDecimal("0"))>0){
+							BigDecimal zb = vo.getLjwc().divide(ljzh,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+							vo.setBnzb(zb.setScale(2,RoundingMode.HALF_UP)+"%");
+						}
+
+					}
+					if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+						BigDecimal qnljzh = itemVoListYearLastYear.stream().map(item->item.getWc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add);
+
+						itemVoListYearLastYear.stream().forEach(item1->{
+							if (StrUtil.equals(vo.getBkmc(),item1.getBkmc())&&StrUtil.equals(vo.getXm(),"鏂板鍚堝悓")&&
+									item1.getWc().compareTo(new BigDecimal("0"))>0){
+								BigDecimal percent = vo.getDywc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								vo.setNtqb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+							}
+							if (qnljzh.compareTo(new BigDecimal("0"))>0){
+								BigDecimal qnzb = item1.getWc().divide(qnljzh,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								if (StrUtil.isNotBlank(vo.getBnzb())){
+									BigDecimal bnzb = new BigDecimal(vo.getBnzb().substring(0,vo.getBnzb().length()-1));
+									vo.setZtqb(bnzb.subtract(qnzb)+"%");
+								}
+							}
+						});
+					}
+				}
+			}
+		}
+		//閿�鍞敹鍏�
+		List<GcpbkwcqkItemVo> itemVoSRListMon = contractOutBoundMapper.gcpbkwcqk(monstart,monend);
+		List<GcpbkwcqkItemVo> itemVoListSRMonLastYear = contractOutBoundMapper.gcpbkwcqk(monstartLastYear,monendLastYear);
+		if (CollUtil.isNotEmpty(itemVoSRListMon)){
+			itemVoSRListMon.stream().forEach(item->{
+				GcpbkwcqkVo vo = new GcpbkwcqkVo();
+				vo.setXm("閿�鍞敹鍏�");
+				vo.setBkmc(item.getBkmc());
+				vo.setDywc(item.getWc());
+				if (CollUtil.isNotEmpty(itemVoListSRMonLastYear)){
+					itemVoListSRMonLastYear.stream().forEach(item1->{
+						if (StrUtil.equals(vo.getBkmc(),item1.getBkmc())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+							BigDecimal percent = vo.getDywc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+							vo.setYtqb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+						}
+					});
+				}
+				list.add(vo);
+			});
+		}
+		List<GcpbkwcqkItemVo> itemVoListSRYear = contractOutBoundMapper.gcpbkwcqk(yearstart,yearend);
+		List<GcpbkwcqkItemVo> itemVoListSRYearLastYear = contractOutBoundMapper.gcpbkwcqk(yearstartLastYear,yearendLastYear);
+		if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListSRYear)){
+			BigDecimal ljzh = itemVoListSRYear.stream().map(item->item.getWc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add);
+			for (GcpbkwcqkVo vo:list
+			) {
+				for (GcpbkwcqkItemVo itemVo:itemVoListSRYear
+				) {
+					if (StrUtil.equals(vo.getBkmc(),itemVo.getBkmc())&&StrUtil.equals(vo.getXm(),"閿�鍞敹鍏�")){
+						vo.setLjwc(itemVo.getWc());
+						if (ljzh.compareTo(new BigDecimal("0"))>0){
+							BigDecimal zb = vo.getLjwc().divide(ljzh,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+							vo.setBnzb(zb.setScale(2,RoundingMode.HALF_UP)+"%");
+						}
+					}
+					if (CollUtil.isNotEmpty(itemVoListSRYearLastYear)){
+						BigDecimal qnljzh = itemVoListSRYearLastYear.stream().map(item->item.getWc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add);
+
+						itemVoListSRYearLastYear.stream().forEach(item1->{
+							if (StrUtil.equals(vo.getBkmc(),item1.getBkmc())&&StrUtil.equals(vo.getXm(),"閿�鍞敹鍏�")&&
+									item1.getWc().compareTo(new BigDecimal("0"))>0){
+								BigDecimal percent = vo.getDywc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								vo.setNtqb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+							}
+							if (qnljzh.compareTo(new BigDecimal("0"))>0){
+								BigDecimal qnzb = item1.getWc().divide(qnljzh,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								if (StrUtil.isNotBlank(vo.getBnzb())){
+									BigDecimal bnzb = new BigDecimal(vo.getBnzb().substring(0,vo.getBnzb().length()-1));
+									vo.setZtqb(bnzb.subtract(qnzb)+"%");
+								}
+							}
+						});
+					}
+				}
+			}
+		}
+		//璐ф鍥炴敹
+		List<GcpbkwcqkItemVo> itemVoListSKMon = contractSubjectMatterMapper.gcpbkwcqkBySK(monstart,monend);
+		List<GcpbkwcqkItemVo> itemVoListSKMonLastYear = contractSubjectMatterMapper.gcpbkwcqkBySK(monstartLastYear,monendLastYear);
+		if (CollUtil.isNotEmpty(itemVoListSKMon)){
+			itemVoListSKMon.stream().forEach(item->{
+				GcpbkwcqkVo vo = new GcpbkwcqkVo();
+				vo.setXm("璐ф鍥炴敹");
+				vo.setBkmc(item.getBkmc());
+				vo.setDywc(item.getWc());
+				if (CollUtil.isNotEmpty(itemVoListSKMonLastYear)){
+					itemVoListSKMonLastYear.stream().forEach(item1->{
+						if (StrUtil.equals(vo.getBkmc(),item1.getBkmc())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+							BigDecimal percent = vo.getDywc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+							vo.setYtqb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+						}
+					});
+				}
+				list.add(vo);
+			});
+		}
+		List<GcpbkwcqkItemVo> itemVoListSKYear = contractSubjectMatterMapper.gcpbkwcqkBySK(yearstart,yearend);
+		List<GcpbkwcqkItemVo> itemVoListSKYearLastYear = contractSubjectMatterMapper.gcpbkwcqkBySK(yearstartLastYear,yearendLastYear);
+		if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListSKYear)){
+			for (GcpbkwcqkVo vo:list
+			) {
+				for (GcpbkwcqkItemVo itemVo:itemVoListSKYear
+				) {
+					if (StrUtil.equals(vo.getBkmc(),itemVo.getBkmc())&&StrUtil.equals(vo.getXm(),"璐ф鍥炴敹")){
+						vo.setLjwc(itemVo.getWc());
+					}
+					if (CollUtil.isNotEmpty(itemVoListSKYearLastYear)){
+						BigDecimal qnljzh = itemVoListSKYearLastYear.stream().map(item->item.getWc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add);
+						itemVoListSKYearLastYear.stream().forEach(item1->{
+							if (StrUtil.equals(vo.getBkmc(),item1.getBkmc())&&StrUtil.equals(vo.getXm(),"璐ф鍥炴敹")&&
+									item1.getWc().compareTo(new BigDecimal("0"))>0){
+								BigDecimal percent = vo.getDywc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								vo.setNtqb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+							}
+							if (qnljzh.compareTo(new BigDecimal("0"))>0){
+								BigDecimal qnzb = item1.getWc().divide(qnljzh,10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								if (StrUtil.isNotBlank(vo.getBnzb())){
+									BigDecimal bnzb = new BigDecimal(vo.getBnzb().substring(0,vo.getBnzb().length()-1));
+									vo.setZtqb(bnzb.subtract(qnzb)+"%");
+								}
+							}
+						});
+					}
+				}
+			}
+		}
+		return R.ok(list);
+	}
+
+	@Override
+	public R sckfzdgzwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		List<SckfzdgzwcqkVo> list = new ArrayList<>();
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		//鏂板鍚堝悓
+		List<GcpbkwcqkItemVo> itemVoListMon = contractSubjectMatterMapper.sckfzdgzwcqk(monstart,monend);
+		if (CollUtil.isNotEmpty(itemVoListMon)){
+			itemVoListMon.stream().forEach(item->{
+				SckfzdgzwcqkVo vo = new SckfzdgzwcqkVo();
+				vo.setDw(item.getDw());
+				vo.setXm(item.getXm());
+				vo.setDywc(item.getWc());
+				Long compId = null;
+				if (StrUtil.equals(item.getDw(),"鐭崇叅鏈�")){
+					compId = 2089995177814495234L;
+				}
+				if (StrUtil.equals(item.getDw(),"鐭冲伐娉�")){
+					compId = 2056556196124250113L;
+				}
+				if (StrUtil.equals(item.getDw(),"閫氭柟鍘�")){
+					compId = 2056556317461270529L;
+				}
+				if (StrUtil.equals(item.getDw(),"閭㈠彴鍘�")){
+					compId = 2056556421857497090L;
+				}
+				AnnualPlanKey plan = annualPlanKeyMapper.selectOne(Wrappers.<AnnualPlanKey>lambdaQuery()
+						.eq(AnnualPlanKey::getPlanYear, queryDTO.getYearMonth().substring(0,4)).eq(AnnualPlanKey::getPlanType, item.getCode())
+						.eq(AnnualPlanKey::getCompId, compId).last("limit 1"));
+				if (ObjUtil.isNotNull(plan)){
+					vo.setDyjh(plan.getMonthAmount(queryDTO.getYearMonth().substring(5)));
+					vo.setLjjh(plan.getToMonTotalAmount(queryDTO.getYearMonth().substring(5)));
+					if (vo.getDyjh().compareTo(new BigDecimal("0"))>0){
+						vo.setYwcl(vo.getDywc().divide(vo.getDyjh(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+								.setScale(2,RoundingMode.HALF_UP)+"%");
+					}
+				}
+				list.add(vo);
+			});
+		}
+		List<GcpbkwcqkItemVo> itemVoListYear = contractSubjectMatterMapper.sckfzdgzwcqk(yearstart,yearend);
+		List<GcpbkwcqkItemVo> itemVoListYearLastYear = contractSubjectMatterMapper.sckfzdgzwcqk(yearstartLastYear,yearendLastYear);
+		if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYear)){
+			for (SckfzdgzwcqkVo vo:list
+			) {
+				for (GcpbkwcqkItemVo itemVo:itemVoListYear
+				) {
+					if (StrUtil.equals(vo.getDw(),itemVo.getDw())&&StrUtil.equals(vo.getXm(),itemVo.getXm())){
+						vo.setLjwc(itemVo.getWc());
+						if (ObjUtil.isNotNull(vo.getLjjh())&&vo.getLjjh().compareTo(new BigDecimal("0"))>0){
+							vo.setLjwcl(vo.getLjwc().divide(vo.getLjjh(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+									.setScale(2,RoundingMode.HALF_UP)+"%");
+						}
+					}
+					if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+						itemVoListYearLastYear.stream().forEach(item1->{
+							if (StrUtil.equals(vo.getDw(),item1.getDw())&&StrUtil.equals(vo.getXm(),itemVo.getXm())&&
+									item1.getWc().compareTo(new BigDecimal("0"))>0){
+								BigDecimal percent = vo.getLjwc().subtract(item1.getWc()).divide(item1.getWc(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+								vo.setLjtb(percent.setScale(2,RoundingMode.HALF_UP)+"%");
+							}
+						});
+					}
+				}
+			}
+		}
+		return R.ok(list);
+	}
+
+	@Override
+	public R pjdxcksxywwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		List<PjdxcksxywwcqkVo> list = new ArrayList<>();
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+
+		if (true){
+			//閰嶄欢寮�绁�
+			List<GcpbkwcqkItemVo> itemVoListMon = contractInvoiceMapper.pjsxywwcqk("1",monstart,monend);
+			List<GcpbkwcqkItemVo> itemVoListMonrLastYear = contractInvoiceMapper.pjsxywwcqk("1",monstartLastYear,monstartLastYear);
+			if (CollUtil.isNotEmpty(itemVoListMon)){
+				itemVoListMon.stream().forEach(item->{
+					PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+					vo.setYw(item.getYw());
+					vo.setLb(item.getLb());
+					vo.setDw(item.getDw());
+					vo.setDywc(item.getWc());
+					if (CollUtil.isNotEmpty(itemVoListMonrLastYear)){
+						itemVoListMon.stream().forEach(item1-> {
+							if (StrUtil.equals(vo.getYw(),item1.getYw())&&StrUtil.equals(vo.getLb(),item1.getLb())&&
+									StrUtil.equals(vo.getDw(),item1.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+								vo.setQnwc(item1.getWc());
+								vo.setYtb(vo.getDywc().subtract(item1.getWc()));
+								if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+									vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+								}
+							}
+						});
+					}
+					list.add(vo);
+				});
+				PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+				vo.setYw(itemVoListMon.get(0).getYw());
+				vo.setLb(itemVoListMon.get(0).getLb());
+				vo.setDw("闆嗗洟");
+				vo.setDywc(itemVoListMon.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				if (CollUtil.isNotEmpty(itemVoListMonrLastYear)){
+					vo.setQnwc(itemVoListMonrLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vo.setYtb(vo.getDywc().subtract(vo.getQnwc()));
+					if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+						vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+					}
+
+				}
+				list.add(vo);
+			}
+			List<GcpbkwcqkItemVo> itemVoListYear = contractInvoiceMapper.pjsxywwcqk("1",yearstart,yearend);
+			List<GcpbkwcqkItemVo> itemVoListYearLastYear = contractInvoiceMapper.pjsxywwcqk("1",yearstartLastYear,yearendLastYear);
+			if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYear)){
+				for (PjdxcksxywwcqkVo vo:list
+				) {
+					for (GcpbkwcqkItemVo itemVo:itemVoListYear
+					) {
+						if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+								StrUtil.equals(vo.getDw(),itemVo.getDw())){
+							vo.setLjwc(itemVo.getWc());
+						}
+						if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+							itemVoListYearLastYear.stream().forEach(item1->{
+								if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+										StrUtil.equals(vo.getDw(),itemVo.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+									vo.setQntq(item1.getWc());
+									vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+									if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+										vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+									}
+								}
+							});
+						}
+					}
+					if (StrUtil.equals(vo.getYw(),"閰嶄欢")&&StrUtil.equals(vo.getLb(),"閿�鍞敹鍏�")&&
+							StrUtil.equals(vo.getDw(),"闆嗗洟")){
+						vo.setLjwc(itemVoListYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+							vo.setQntq(itemVoListYearLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+							vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+							if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+								vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+							}
+
+						}
+					}
+				}
+			}
+			//閰嶄欢鍚堝悓
+			List<GcpbkwcqkItemVo> itemVoListMonHT = contractMapper.pjsxywwcqkHT("1",monstart,monend);
+			List<GcpbkwcqkItemVo> itemVoListMonrHTLastYear = contractMapper.pjsxywwcqkHT("1",monstartLastYear,monstartLastYear);
+			if (CollUtil.isNotEmpty(itemVoListMonHT)){
+				itemVoListMonHT.stream().forEach(item->{
+					PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+					vo.setYw(item.getYw());
+					vo.setLb(item.getLb());
+					vo.setDw(item.getDw());
+					vo.setDywc(item.getWc());
+					if (CollUtil.isNotEmpty(itemVoListMonrHTLastYear)){
+						itemVoListMonrHTLastYear.stream().forEach(item1-> {
+							if (StrUtil.equals(vo.getYw(),item1.getYw())&&StrUtil.equals(vo.getLb(),item1.getLb())&&
+									StrUtil.equals(vo.getDw(),item1.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+								vo.setQnwc(item1.getWc());
+								vo.setYtb(vo.getDywc().subtract(item1.getWc()));
+								if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+									vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+								}
+							}
+						});
+					}
+					list.add(vo);
+				});
+				PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+				vo.setYw(itemVoListMon.get(0).getYw());
+				vo.setLb(itemVoListMon.get(0).getLb());
+				vo.setDw("闆嗗洟");
+				vo.setDywc(itemVoListMon.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				if (CollUtil.isNotEmpty(itemVoListMonrHTLastYear)){
+					vo.setQnwc(itemVoListMonrHTLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vo.setYtb(vo.getDywc().subtract(vo.getQnwc()));
+					if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+						vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+					}
+				}
+				list.add(vo);
+			}
+			List<GcpbkwcqkItemVo> itemVoListYearHT = contractMapper.pjsxywwcqkHT("1",yearstart,yearend);
+			List<GcpbkwcqkItemVo> itemVoListYearHTLastYear = contractMapper.pjsxywwcqkHT("1",yearstartLastYear,yearendLastYear);
+			if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYearHT)){
+				for (PjdxcksxywwcqkVo vo:list
+				) {
+					for (GcpbkwcqkItemVo itemVo:itemVoListYearHT
+					) {
+						if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+								StrUtil.equals(vo.getDw(),itemVo.getDw())){
+							vo.setLjwc(itemVo.getWc());
+						}
+						if (CollUtil.isNotEmpty(itemVoListYearHTLastYear)){
+							itemVoListYearHTLastYear.stream().forEach(item1->{
+								if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+										StrUtil.equals(vo.getDw(),itemVo.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+									vo.setQntq(item1.getWc());
+									vo.setLjtb(vo.getLjwc().subtract(item1.getWc()));
+									if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+										vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+									}
+								}
+							});
+						}
+					}
+					if (StrUtil.equals(vo.getYw(),"閰嶄欢")&&StrUtil.equals(vo.getLb(),"鏂板鍚堝悓")&&
+							StrUtil.equals(vo.getDw(),"闆嗗洟")){
+						vo.setLjwc(itemVoListYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						if (CollUtil.isNotEmpty(itemVoListYearHTLastYear)){
+							vo.setQntq(itemVoListYearHTLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+							vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+							if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+								vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+							}
+
+						}
+					}
+				}
+			}
+		}
+		if (true){
+			//澶т慨寮�绁�
+			List<GcpbkwcqkItemVo> itemVoListMon = contractInvoiceMapper.dxsxywwcqk("2",monstart,monend);
+			List<GcpbkwcqkItemVo> itemVoListMonrLastYear = contractInvoiceMapper.dxsxywwcqk("2",monstartLastYear,monendLastYear);
+			if (CollUtil.isNotEmpty(itemVoListMon)){
+				itemVoListMon.stream().forEach(item->{
+					PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+					vo.setYw(item.getYw());
+					vo.setLb(item.getLb());
+					vo.setDw(item.getDw());
+					vo.setDywc(item.getWc());
+					if (CollUtil.isNotEmpty(itemVoListMonrLastYear)){
+						itemVoListMon.stream().forEach(item1-> {
+							if (StrUtil.equals(vo.getYw(),item1.getYw())&&StrUtil.equals(vo.getLb(),item1.getLb())&&
+									StrUtil.equals(vo.getDw(),item1.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+								vo.setQnwc(item1.getWc());
+								vo.setYtb(vo.getDywc().subtract(item1.getWc()));
+								if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+									vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+								}
+							}
+						});
+					}
+					list.add(vo);
+				});
+				PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+				vo.setYw(itemVoListMon.get(0).getYw());
+				vo.setLb(itemVoListMon.get(0).getLb());
+				vo.setDw("闆嗗洟");
+				vo.setDywc(itemVoListMon.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				if (CollUtil.isNotEmpty(itemVoListMonrLastYear)){
+					vo.setQnwc(itemVoListMonrLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vo.setYtb(vo.getDywc().subtract(vo.getQnwc()));
+					if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+						vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+					}
+
+				}
+				list.add(vo);
+			}
+			List<GcpbkwcqkItemVo> itemVoListYear = contractInvoiceMapper.dxsxywwcqk("2",yearstart,yearend);
+			List<GcpbkwcqkItemVo> itemVoListYearLastYear = contractInvoiceMapper.dxsxywwcqk("2",yearstartLastYear,yearendLastYear);
+			if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYear)){
+				for (PjdxcksxywwcqkVo vo:list
+				) {
+					for (GcpbkwcqkItemVo itemVo:itemVoListYear
+					) {
+						if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+								StrUtil.equals(vo.getDw(),itemVo.getDw())){
+							vo.setLjwc(itemVo.getWc());
+						}
+						if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+							itemVoListYearLastYear.stream().forEach(item1->{
+								if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+										StrUtil.equals(vo.getDw(),itemVo.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+									vo.setQntq(item1.getWc());
+									vo.setLjtb(vo.getLjwc().subtract(item1.getWc()));
+									if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+										vo.setLjtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+									}
+								}
+							});
+						}
+					}
+					if (StrUtil.equals(vo.getYw(),"澶т慨")&&StrUtil.equals(vo.getLb(),"閿�鍞敹鍏�")&&
+							StrUtil.equals(vo.getDw(),"闆嗗洟")){
+						vo.setLjwc(itemVoListYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+							vo.setQntq(itemVoListYearLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+							vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+							if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+								vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+							}
+
+						}
+					}
+				}
+			}
+			//澶т慨鍚堝悓
+			List<GcpbkwcqkItemVo> itemVoListMonHT = contractMapper.dxsxywwcqkHT("2",monstart,monend);
+			List<GcpbkwcqkItemVo> itemVoListMonrHTLastYear = contractMapper.dxsxywwcqkHT("2",monstartLastYear,monendLastYear);
+			if (CollUtil.isNotEmpty(itemVoListMonHT)){
+				itemVoListMonHT.stream().forEach(item->{
+					PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+					vo.setYw(item.getYw());
+					vo.setLb(item.getLb());
+					vo.setDw(item.getDw());
+					vo.setDywc(item.getWc());
+					if (CollUtil.isNotEmpty(itemVoListMonrHTLastYear)){
+						itemVoListMonrHTLastYear.stream().forEach(item1-> {
+							if (StrUtil.equals(vo.getYw(),item1.getYw())&&StrUtil.equals(vo.getLb(),item1.getLb())&&
+									StrUtil.equals(vo.getDw(),item1.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+								vo.setQnwc(item1.getWc());
+								vo.setYtb(vo.getDywc().subtract(item1.getWc()));
+								if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+									vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+								}
+							}
+						});
+					}
+					list.add(vo);
+				});
+				PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+				vo.setYw(itemVoListMon.get(0).getYw());
+				vo.setLb(itemVoListMon.get(0).getLb());
+				vo.setDw("闆嗗洟");
+				vo.setDywc(itemVoListMon.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				if (CollUtil.isNotEmpty(itemVoListMonrHTLastYear)){
+					vo.setQnwc(itemVoListMonrHTLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vo.setYtb(vo.getDywc().subtract(vo.getQnwc()));
+					if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+						vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+					}
+
+				}
+				list.add(vo);
+			}
+			List<GcpbkwcqkItemVo> itemVoListYearHT = contractMapper.dxsxywwcqkHT("2",yearstart,yearend);
+			List<GcpbkwcqkItemVo> itemVoListYearHTLastYear = contractMapper.dxsxywwcqkHT("2",yearstartLastYear,yearendLastYear);
+			if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYearHT)){
+				for (PjdxcksxywwcqkVo vo:list
+				) {
+					for (GcpbkwcqkItemVo itemVo:itemVoListYearHT
+					) {
+						if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+								StrUtil.equals(vo.getDw(),itemVo.getDw())){
+							vo.setLjwc(itemVo.getWc());
+						}
+						if (CollUtil.isNotEmpty(itemVoListYearHTLastYear)){
+							itemVoListYearHTLastYear.stream().forEach(item1->{
+								if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+										StrUtil.equals(vo.getDw(),itemVo.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+									vo.setQntq(item1.getWc());
+									vo.setLjtb(vo.getLjwc().subtract(item1.getWc()));
+									if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+										vo.setLjtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+									}
+								}
+							});
+						}
+					}
+					if (StrUtil.equals(vo.getYw(),"澶т慨")&&StrUtil.equals(vo.getLb(),"鏂板鍚堝悓")&&
+							StrUtil.equals(vo.getDw(),"闆嗗洟")){
+						vo.setLjwc(itemVoListYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						if (CollUtil.isNotEmpty(itemVoListYearHTLastYear)){
+							vo.setQntq(itemVoListYearHTLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+							vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+							if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+								vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+							}
+
+						}
+					}
+				}
+			}
+		}
+		if (true){
+			//鍑哄彛寮�绁�
+			List<GcpbkwcqkItemVo> itemVoListMon = contractInvoiceMapper.cksxywwcqk("1",monstart,monend);
+			List<GcpbkwcqkItemVo> itemVoListMonrLastYear = contractInvoiceMapper.cksxywwcqk("1",monstartLastYear,monendLastYear);
+			if (CollUtil.isNotEmpty(itemVoListMon)){
+				itemVoListMon.stream().forEach(item->{
+					PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+					vo.setYw(item.getYw());
+					vo.setLb(item.getLb());
+					vo.setDw(item.getDw());
+					vo.setDywc(item.getWc());
+					if (CollUtil.isNotEmpty(itemVoListMonrLastYear)){
+						itemVoListMon.stream().forEach(item1-> {
+							if (StrUtil.equals(vo.getYw(),item1.getYw())&&StrUtil.equals(vo.getLb(),item1.getLb())&&
+									StrUtil.equals(vo.getDw(),item1.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+								vo.setQnwc(item1.getWc());
+								vo.setYtb(vo.getDywc().subtract(item1.getWc()));
+								if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+									vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+								}
+							}
+						});
+					}
+					list.add(vo);
+				});
+				PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+				vo.setYw(itemVoListMon.get(0).getYw());
+				vo.setLb(itemVoListMon.get(0).getLb());
+				vo.setDw("闆嗗洟");
+				vo.setDywc(itemVoListMon.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				if (CollUtil.isNotEmpty(itemVoListMonrLastYear)){
+					vo.setQnwc(itemVoListMonrLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vo.setYtb(vo.getDywc().subtract(vo.getQnwc()));
+					if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+						vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+					}
+				}
+				list.add(vo);
+			}
+			List<GcpbkwcqkItemVo> itemVoListYear = contractInvoiceMapper.cksxywwcqk("1",yearstart,yearend);
+			List<GcpbkwcqkItemVo> itemVoListYearLastYear = contractInvoiceMapper.cksxywwcqk("1",yearstartLastYear,yearendLastYear);
+			if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYear)){
+				for (PjdxcksxywwcqkVo vo:list
+				) {
+					for (GcpbkwcqkItemVo itemVo:itemVoListYear
+					) {
+						if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+								StrUtil.equals(vo.getDw(),itemVo.getDw())){
+							vo.setLjwc(itemVo.getWc());
+						}
+						if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+							itemVoListYearLastYear.stream().forEach(item1->{
+								if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+										StrUtil.equals(vo.getDw(),itemVo.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+									vo.setQntq(item1.getWc());
+									vo.setLjtb(vo.getLjwc().subtract(item1.getWc()));
+									if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+										vo.setLjtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+									}
+								}
+							});
+						}
+					}
+					if (StrUtil.equals(vo.getYw(),"鍑哄彛")&&StrUtil.equals(vo.getLb(),"閿�鍞敹鍏�")&&
+							StrUtil.equals(vo.getDw(),"闆嗗洟")){
+						vo.setLjwc(itemVoListYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						if (CollUtil.isNotEmpty(itemVoListYearLastYear)){
+							vo.setQntq(itemVoListYearLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+							vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+							if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+								vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+							}
+						}
+					}
+				}
+			}
+			//閰嶄欢鍚堝悓
+			List<GcpbkwcqkItemVo> itemVoListMonHT = contractMapper.cksxywwcqkHT("1",monstart,monend);
+			List<GcpbkwcqkItemVo> itemVoListMonrHTLastYear = contractMapper.cksxywwcqkHT("1",monstartLastYear,monendLastYear);
+			if (CollUtil.isNotEmpty(itemVoListMonHT)){
+				itemVoListMonHT.stream().forEach(item->{
+					PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+					vo.setYw(item.getYw());
+					vo.setLb(item.getLb());
+					vo.setDw(item.getDw());
+					vo.setDywc(item.getWc());
+					if (CollUtil.isNotEmpty(itemVoListMonrHTLastYear)){
+						itemVoListMonrHTLastYear.stream().forEach(item1-> {
+							if (StrUtil.equals(vo.getYw(),item1.getYw())&&StrUtil.equals(vo.getLb(),item1.getLb())&&
+									StrUtil.equals(vo.getDw(),item1.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+								vo.setQnwc(item1.getWc());
+								vo.setYtb(vo.getDywc().subtract(item1.getWc()));
+								if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+									vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+								}
+							}
+						});
+					}
+					list.add(vo);
+				});
+				PjdxcksxywwcqkVo vo = new PjdxcksxywwcqkVo();
+				vo.setYw(itemVoListMon.get(0).getYw());
+				vo.setLb(itemVoListMon.get(0).getLb());
+				vo.setDw("闆嗗洟");
+				vo.setDywc(itemVoListMon.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				if (CollUtil.isNotEmpty(itemVoListMonrHTLastYear)){
+					vo.setQnwc(itemVoListMonrHTLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vo.setYtb(vo.getDywc().subtract(vo.getQnwc()));
+					if (vo.getQnwc().compareTo(new BigDecimal("0"))>0) {
+						vo.setYtqb(vo.getYtb().divide(vo.getQnwc(), 2, RoundingMode.HALF_UP) + "%");
+					}
+
+				}
+				list.add(vo);
+			}
+			List<GcpbkwcqkItemVo> itemVoListYearHT = contractMapper.cksxywwcqkHT("1",yearstart,yearend);
+			List<GcpbkwcqkItemVo> itemVoListYearHTLastYear = contractMapper.cksxywwcqkHT("1",yearstartLastYear,yearendLastYear);
+			if (CollUtil.isNotEmpty(list)&&CollUtil.isNotEmpty(itemVoListYearHT)){
+				for (PjdxcksxywwcqkVo vo:list
+				) {
+					for (GcpbkwcqkItemVo itemVo:itemVoListYearHT
+					) {
+						if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+								StrUtil.equals(vo.getDw(),itemVo.getDw())){
+							vo.setLjwc(itemVo.getWc());
+						}
+						if (CollUtil.isNotEmpty(itemVoListYearHTLastYear)){
+							itemVoListYearHTLastYear.stream().forEach(item1->{
+								if (StrUtil.equals(vo.getYw(),itemVo.getYw())&&StrUtil.equals(vo.getLb(),itemVo.getLb())&&
+										StrUtil.equals(vo.getDw(),itemVo.getDw())&&item1.getWc().compareTo(new BigDecimal("0"))>0){
+									vo.setQntq(item1.getWc());
+									vo.setLjtb(vo.getLjwc().subtract(item1.getWc()));
+									if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+										vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+									}
+								}
+							});
+						}
+					}
+					if (StrUtil.equals(vo.getYw(),"鍑哄彛")&&StrUtil.equals(vo.getLb(),"鏂板鍚堝悓")&&
+							StrUtil.equals(vo.getDw(),"闆嗗洟")){
+						vo.setLjwc(itemVoListYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						if (CollUtil.isNotEmpty(itemVoListYearHTLastYear)){
+							vo.setQntq(itemVoListYearHTLastYear.stream().map(GcpbkwcqkItemVo::getWc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+							vo.setLjtb(vo.getLjwc().subtract(vo.getQntq()));
+							if (vo.getQntq().compareTo(new BigDecimal("0"))>0) {
+								vo.setLjtqb(vo.getLjtb().divide(vo.getQntq(), 2, RoundingMode.HALF_UP) + "%");
+							}
+
+						}
+					}
+				}
+			}
+		}
+		if (CollUtil.isNotEmpty(list)){
+			String[] arrLb = {"閿�鍞敹鍏�", "鏂板鍚堝悓"};
+			String[] arrDw = {"鐭崇叅鏈�", "鐭冲伐娉�", "閭㈠彴鍘�", "閫氭柟鍘�","闆嗗洟"};
+			for (int i = 0; i < arrLb.length; i++) {
+				for (int j = 0; j < arrDw.length; j++) {
+					PjdxcksxywwcqkVo vosmj = new PjdxcksxywwcqkVo();
+					vosmj.setYw("浠ヤ笂涓夐」鍚堣");
+					String lb = arrLb[i];
+					String dw = arrDw[j];
+					vosmj.setLb(lb);
+					vosmj.setDw(dw);
+					vosmj.setDywc(list.stream().filter(item->item.getLb().equals(lb)&&item.getDw().equals(dw)).collect(Collectors.toList())
+							.stream().map(item->item.getDywc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vosmj.setQnwc(list.stream().filter(item->item.getLb().equals(lb)&&item.getDw().equals(dw)).collect(Collectors.toList())
+							.stream().map(item->item.getQnwc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vosmj.setYtb(vosmj.getDywc().subtract(vosmj.getQnwc()));
+					if (vosmj.getQnwc().compareTo(new BigDecimal("0"))>0){
+						vosmj.setYtqb(vosmj.getYtb().divide(vosmj.getQnwc(),2,RoundingMode.HALF_UP)+"%");
+					}
+					vosmj.setLjwc(list.stream().filter(item->item.getLb().equals(lb)&&item.getDw().equals(dw)).collect(Collectors.toList())
+							.stream().map(item->item.getLjwc()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vosmj.setQntq(list.stream().filter(item->item.getLb().equals(lb)&&item.getDw().equals(dw)).collect(Collectors.toList())
+							.stream().map(item->item.getQntq()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+					vosmj.setLjtb(vosmj.getLjwc().subtract(vosmj.getQntq()));
+					if (vosmj.getQntq().compareTo(new BigDecimal("0"))>0){
+						vosmj.setLjtqb(vosmj.getLjtb().divide(vosmj.getQntq(),2,RoundingMode.HALF_UP)+"%");
+					}
+					list.add(vosmj);
+				}
+			}
+		}
+		return R.ok(list);
+	}
+
+	@Override
+	public R cpxzhtwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		List<CpxssrwcqkVo> list = new ArrayList<>();
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+
+		List<CpxssrwcqkItemVo> itemVoListDY = contractSubjectMatterMapper.cpxzhtwcqk(monstart,monend);
+		List<CpxssrwcqkItemVo> itemVoListLJ = contractSubjectMatterMapper.cpxzhtwcqk(yearstart,yearend);
+		List<CpxssrwcqkItemVo> itemVoListQN = contractSubjectMatterMapper.cpxzhtwcqk(yearstartLastYear,yearendLastYear);
+		List<Integer> indexList = new ArrayList<>();
+		if (CollUtil.isNotEmpty(itemVoListDY)){
+			for (int i = 0; i < itemVoListDY.size(); i++) {
+				CpxssrwcqkItemVo item = itemVoListDY.get(i);
+				CpxssrwcqkVo vo = new CpxssrwcqkVo();
+				vo.setXm(item.getXm());
+				BipDict dict = bipDictMapper.selectOne(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictKey,"zb-cpmc")
+						.eq(BipDict::getParentId,0).eq(BipDict::getDictName,item.getXm()).last("limit 1"));
+				if (ObjUtil.isNull(dict)) {
+					vo.setDyxsl(item.getXsl());
+					vo.setDyxssr(item.getXssr());
+					if (CollUtil.isNotEmpty(itemVoListLJ)) {
+						itemVoListLJ.stream().forEach(item1 -> {
+							if (StrUtil.equals(vo.getXm(), item1.getXm())) {
+								vo.setLjxsl(item1.getXsl());
+								vo.setLjxssr(item1.getXssr());
+							}
+						});
+					}
+					if (CollUtil.isNotEmpty(itemVoListQN)) {
+						itemVoListQN.stream().forEach(item1 -> {
+							if (StrUtil.equals(vo.getXm(), item1.getXm())) {
+								vo.setQnljxsl(item1.getXsl());
+								vo.setQnljxssr(item1.getXssr());
+								vo.setTqbxsl(vo.getLjxsl().subtract(vo.getQnljxsl()));
+								vo.setTqbxssr(vo.getLjxssr().subtract(vo.getQnljxssr()));
+							}
+						});
+					}
+				}else {
+					indexList.add(i);
+				}
+				list.add(vo);
+			}
+			indexList.add(itemVoListDY.size());
+			for (int i = 0; i < indexList.size()-1; i++) {
+				List<CpxssrwcqkVo> sublist = list.subList(i,i+1);
+				list.get(i).setDyxsl(sublist.stream().map(item->item.getDyxsl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setDyxssr(sublist.stream().map(item->item.getDyxssr()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setLjxsl(sublist.stream().map(item->item.getLjxsl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setLjxssr(sublist.stream().map(item->item.getLjxssr()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setQnljxsl(sublist.stream().map(item->item.getQnljxsl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setQnljxssr(sublist.stream().map(item->item.getQnljxssr()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setTqbxsl(list.get(i).getLjxsl().subtract(list.get(i).getQnljxsl()));
+				list.get(i).setTqbxssr(list.get(i).getLjxssr().subtract(list.get(i).getQnljxssr()));
+			}
+		}
+		return R.ok(list);
+	}
+
+	@Override
+	public R snqqwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+
+		List<SnqqwcqkVo> list = historyOverdueMapper.snqqwcqk(monstart,monend,yearstart,yearend);
+		if (CollUtil.isNotEmpty(list)){
+			list.stream().forEach(item->{
+				Long compId = null;
+				if (StrUtil.equals(item.getDw(),"鐭崇叅鏈�")){
+					compId = 2089995177814495234L;
+				}
+				if (StrUtil.equals(item.getDw(),"鐭冲伐娉�")){
+					compId = 2056556196124250113L;
+				}
+				if (StrUtil.equals(item.getDw(),"閫氭柟鍘�")){
+					compId = 2056556317461270529L;
+				}
+				if (StrUtil.equals(item.getDw(),"閭㈠彴鍘�")){
+					compId = 2056556421857497090L;
+				}
+				if (StrUtil.isNotBlank(item.getCode())) {
+					AnnualTarget plan = annualTargetMapper.selectOne(Wrappers.<AnnualTarget>lambdaQuery()
+							.eq(AnnualTarget::getPlanYear, queryDTO.getYearMonth().substring(0, 4))
+							.eq(AnnualTarget::getPlanType, item.getCode())
+							.eq(AnnualTarget::getCompId, compId).last("limit 1"));
+					if (ObjUtil.isNotNull(plan)) {
+						item.setNdzb(plan.getTotalAmount());
+						if (item.getNdzb().compareTo(new BigDecimal("0")) > 0) {
+							item.setZbwcl(item.getLjwcqh().divide(item.getNdzb(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+									.setScale(2, RoundingMode.HALF_UP) + "%");
+						}
+					}
+				}else {
+					List<AnnualTarget> planList = annualTargetMapper.selectList(Wrappers.<AnnualTarget>lambdaQuery()
+							.eq(AnnualTarget::getPlanYear, queryDTO.getYearMonth().substring(0, 4))
+							.eq(AnnualTarget::getCompId, compId));
+					if(CollUtil.isNotEmpty(planList)){
+						BigDecimal total = new BigDecimal("0");
+						for (AnnualTarget plan:planList
+							 ) {
+							total = total.add(plan.getTotalAmount());
+						}
+						item.setNdzb(total);
+						if (item.getNdzb().compareTo(new BigDecimal("0")) > 0) {
+							item.setZbwcl(item.getLjwcqh().divide(item.getNdzb(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+									.setScale(2, RoundingMode.HALF_UP) + "%");
+						}
+					}
+				}
+			});
+			SnqqwcqkVo jt3n = new SnqqwcqkVo();
+			jt3n.setDw("闆嗗洟");
+			jt3n.setXm("3骞�");
+			jt3n.setNdzb(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞�")).map(SnqqwcqkVo::getNdzb).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3n.setDywcqq(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞�")).map(SnqqwcqkVo::getDywcqq).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3n.setDywcqh(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞�")).map(SnqqwcqkVo::getDywcqh).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3n.setLjwcqq(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞�")).map(SnqqwcqkVo::getLjwcqq).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3n.setLjwcqh(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞�")).map(SnqqwcqkVo::getLjwcqh).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			if (jt3n.getNdzb().compareTo(new BigDecimal("0")) > 0) {
+				jt3n.setZbwcl(jt3n.getLjwcqh().divide(jt3n.getNdzb(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			SnqqwcqkVo jt3nys = new SnqqwcqkVo();
+			jt3nys.setDw("闆嗗洟");
+			jt3nys.setXm("3骞翠互涓�");
+			jt3nys.setNdzb(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞翠互涓�")).map(SnqqwcqkVo::getNdzb).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3nys.setDywcqq(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞翠互涓�")).map(SnqqwcqkVo::getDywcqq).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3nys.setDywcqh(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞翠互涓�")).map(SnqqwcqkVo::getDywcqh).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3nys.setLjwcqq(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞翠互涓�")).map(SnqqwcqkVo::getLjwcqq).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jt3nys.setLjwcqh(list.stream().filter(item->StrUtil.equals(item.getXm(),"3骞翠互涓�")).map(SnqqwcqkVo::getLjwcqh).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			if (jt3nys.getNdzb().compareTo(new BigDecimal("0")) > 0) {
+				jt3nys.setZbwcl(jt3n.getLjwcqh().divide(jt3n.getNdzb(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			SnqqwcqkVo jthj = new SnqqwcqkVo();
+			jthj.setDw("闆嗗洟");
+			jthj.setXm("鍚堣");
+			jthj.setNdzb(list.stream().filter(item->StrUtil.equals(item.getXm(),"灏忚")).map(SnqqwcqkVo::getNdzb).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jthj.setDywcqq(list.stream().filter(item->StrUtil.equals(item.getXm(),"灏忚")).map(SnqqwcqkVo::getDywcqq).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jthj.setDywcqh(list.stream().filter(item->StrUtil.equals(item.getXm(),"灏忚")).map(SnqqwcqkVo::getDywcqh).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jthj.setLjwcqq(list.stream().filter(item->StrUtil.equals(item.getXm(),"灏忚")).map(SnqqwcqkVo::getLjwcqq).filter(Objects::nonNull ).reduce(BigDecimal.ZERO,BigDecimal::add));
+			jthj.setLjwcqh(list.stream().filter(item->StrUtil.equals(item.getXm(),"灏忚")).map(SnqqwcqkVo::getLjwcqh).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+			if (jthj.getNdzb().compareTo(new BigDecimal("0")) > 0) {
+				jthj.setZbwcl(jthj.getLjwcqh().divide(jthj.getNdzb(), 10, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+						.setScale(2, RoundingMode.HALF_UP) + "%");
+			}
+			list.add(jt3n);
+			list.add(jt3nys);
+			list.add(jthj);
+		}
+		return R.ok(list);
+	}
+
+	@Override
+	public R cpxssrwcqk(ZBJTStatisticDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getYearMonth())){
+			return R.failed("鏌ヨ骞存湀涓嶈兘涓虹┖");
+		}
+		List<CpxssrwcqkVo> list = new ArrayList<>();
+		Date monstart = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00");
+		Date monend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date monstartLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-01 00:00:00"),-1);
+		Date monendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+		Date yearstart = DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00");
+		Date yearend = DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59");
+		Date yearstartLastYear =  DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth().substring(0,4)+"-01-01 00:00:00"),-1);
+		Date yearendLastYear = DateUtil.offsetYear(DateUtil.parseDateTime(queryDTO.getYearMonth()+"-31 23:59:59"),-1);
+
+		List<CpxssrwcqkItemVo> itemVoListDY = contractOutBoundMapper.cpxssrwcqk(monstart,monend);
+		List<CpxssrwcqkItemVo> itemVoListLJ = contractOutBoundMapper.cpxssrwcqk(yearstart,yearend);
+		List<CpxssrwcqkItemVo> itemVoListQN = contractOutBoundMapper.cpxssrwcqk(yearstartLastYear,yearendLastYear);
+		List<Integer> indexList = new ArrayList<>();
+		if (CollUtil.isNotEmpty(itemVoListDY)){
+			for (int i = 0; i < itemVoListDY.size(); i++) {
+				CpxssrwcqkItemVo item = itemVoListDY.get(i);
+				CpxssrwcqkVo vo = new CpxssrwcqkVo();
+				vo.setXm(item.getXm());
+				BipDict dict = bipDictMapper.selectOne(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictKey,"zb-cpmc")
+						.eq(BipDict::getParentId,0).eq(BipDict::getDictName,item.getXm()).last("limit 1"));
+				if (ObjUtil.isNull(dict)) {
+					vo.setDyxsl(item.getXsl());
+					vo.setDyxssr(item.getXssr());
+					if (CollUtil.isNotEmpty(itemVoListLJ)) {
+						itemVoListLJ.stream().forEach(item1 -> {
+							if (StrUtil.equals(vo.getXm(), item1.getXm())) {
+								vo.setLjxsl(item1.getXsl());
+								vo.setLjxssr(item1.getXssr());
+							}
+						});
+					}
+					if (CollUtil.isNotEmpty(itemVoListQN)) {
+						itemVoListQN.stream().forEach(item1 -> {
+							if (StrUtil.equals(vo.getXm(), item1.getXm())) {
+								vo.setQnljxsl(item1.getXsl());
+								vo.setQnljxssr(item1.getXssr());
+								vo.setTqbxsl(vo.getLjxsl().subtract(vo.getQnljxsl()));
+								vo.setTqbxssr(vo.getLjxssr().subtract(vo.getQnljxssr()));
+							}
+						});
+					}
+				}else {
+					indexList.add(i);
+				}
+				list.add(vo);
+			}
+			indexList.add(itemVoListDY.size());
+			for (int i = 0; i < indexList.size()-1; i++) {
+				List<CpxssrwcqkVo> sublist = list.subList(i,i+1);
+				list.get(i).setDyxsl(sublist.stream().map(item->item.getDyxsl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setDyxssr(sublist.stream().map(item->item.getDyxssr()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setLjxsl(sublist.stream().map(item->item.getLjxsl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setLjxssr(sublist.stream().map(item->item.getLjxssr()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setQnljxsl(sublist.stream().map(item->item.getQnljxsl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setQnljxssr(sublist.stream().map(item->item.getQnljxssr()).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+				list.get(i).setTqbxsl(list.get(i).getLjxsl().subtract(list.get(i).getQnljxsl()));
+				list.get(i).setTqbxssr(list.get(i).getLjxssr().subtract(list.get(i).getQnljxssr()));
+			}
+		}
+		return R.ok(list);
+	}
+}
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/AnnualPlanKeyMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/AnnualPlanKeyMapper.xml
new file mode 100644
index 0000000..9786313
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/AnnualPlanKeyMapper.xml
@@ -0,0 +1,32 @@
+<?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.AnnualPlanKeyMapper">
+
+  <resultMap id="annualPlanKeyMap" type="com.by4cloud.platformx.business.entity.AnnualPlanKey">
+        <id property="id" column="id"/>
+        <result property="compId" column="comp_id"/>
+        <result property="planType" column="plan_type"/>
+        <result property="aprAmount" column="apr_amount"/>
+        <result property="augAmount" column="aug_amount"/>
+        <result property="decAmount" column="dec_amount"/>
+        <result property="febAmount" column="feb_amount"/>
+        <result property="janAmount" column="jan_amount"/>
+        <result property="julAmount" column="jul_amount"/>
+        <result property="junAmount" column="jun_amount"/>
+        <result property="marAmount" column="mar_amount"/>
+        <result property="mayAmount" column="may_amount"/>
+        <result property="novAmount" column="nov_amount"/>
+        <result property="octAmount" column="oct_amount"/>
+        <result property="planYear" column="plan_year"/>
+        <result property="sepAmount" column="sep_amount"/>
+        <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>
+    <select id="selectPlanYear" resultType="com.by4cloud.platformx.business.vo.AnnualPlanTotalVo">
+
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/AnnualTargetMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/AnnualTargetMapper.xml
new file mode 100644
index 0000000..b30d9f4
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/AnnualTargetMapper.xml
@@ -0,0 +1,29 @@
+<?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.AnnualTargetMapper">
+
+  <resultMap id="annualTargetMap" type="com.by4cloud.platformx.business.entity.AnnualTarget">
+        <id property="id" column="id"/>
+        <result property="compId" column="comp_id"/>
+        <result property="planType" column="plan_type"/>
+        <result property="aprAmount" column="apr_amount"/>
+        <result property="augAmount" column="aug_amount"/>
+        <result property="decAmount" column="dec_amount"/>
+        <result property="febAmount" column="feb_amount"/>
+        <result property="janAmount" column="jan_amount"/>
+        <result property="julAmount" column="jul_amount"/>
+        <result property="junAmount" column="jun_amount"/>
+        <result property="marAmount" column="mar_amount"/>
+        <result property="mayAmount" column="may_amount"/>
+        <result property="novAmount" column="nov_amount"/>
+        <result property="octAmount" column="oct_amount"/>
+        <result property="planYear" column="plan_year"/>
+        <result property="sepAmount" column="sep_amount"/>
+        <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/ContractInvoiceMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
index 24bf251..2bb5061 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
@@ -44,21 +44,22 @@
 				   SELECT sum(ci.invoice_total_price_tax)
 				   FROM contract_invoice ci
 				   WHERE ci.del_flag = '0'
-					 AND comp_id = 2089995177814495234
+					 AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
 					 AND ci.invoice_time &gt;= CURDATE()
 					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            smjbr,
 			   (
 				   SELECT sum(ci.invoice_total_price_tax)
 				   FROM contract_invoice ci
 				   WHERE ci.del_flag = '0'
-					 AND comp_id = 2089995177814495234
+					 AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+
 					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
 					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) smjby,
 			   (
 				   SELECT sum(ci.invoice_total_price_tax)
 				   FROM contract_invoice ci
 				   WHERE ci.del_flag = '0'
-					 AND comp_id = 2089995177814495234
+					 AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
 					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
 					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  smjbn,
 			   (
@@ -481,7 +482,7 @@
 			AND t2.company_name LIKE CONCAT('%', #{queryDTO.partyA}, '%')
 		</if>
 		<if test="queryDTO.queryProvince !=null and queryDTO.queryProvince !=''">
-			AND t2.province =  #{queryDTO.queryProvince}
+			AND t2.province = #{queryDTO.queryProvince}
 		</if>
 		<if test="queryDTO.queryServiceAttr !=null and queryDTO.queryServiceAttr !=''">
 			AND t2.export_service_attr = #{queryDTO.queryServiceAttr}
@@ -573,14 +574,19 @@
 		update_time,
 		del_flag,
 		comp_id,
-		(select count(1) from contract_invoice ci where ci.del_flag = '0' and (ci.contract_id = c.id or FIND_IN_SET(c.id,REPLACE(REPLACE(ci.contract_ids,'[', ''), ']', '')))) invoiceNum,
-		(select planned_amount from contract_payment_schedule cps where cps.del_flag='0' and cps.stage_name='鍚堝悓绛捐' and cps.contract_id = c.id) advanceAmount
+		(select count(1) from contract_invoice ci where ci.del_flag = '0' and (ci.contract_id = c.id or
+		FIND_IN_SET(c.id,REPLACE(REPLACE(ci.contract_ids,'[', ''), ']', '')))) invoiceNum,
+		(select planned_amount from contract_payment_schedule cps where cps.del_flag='0' and cps.stage_name='鍚堝悓绛捐' and
+		cps.contract_id = c.id) advanceAmount
 		FROM
 		contract c
 		WHERE
 		del_flag = '0'
 		<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
 			AND contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
+		</if>
+		<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}, '%')
@@ -597,220 +603,153 @@
 		ORDER BY
 		create_time ASC
 	</select>
-    <select id="homeZgsData" resultType="com.by4cloud.platformx.business.vo.HomeZgsData">
-		SELECT
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND c.party_b_id = #{compId}
-		AND bc.province=#{province}
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) kpbr,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		  AND c.party_b_id = #{compId}
-		  AND bc.province=#{province}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) kpby,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		  AND c.party_b_id = #{compId}
-		  AND bc.province=#{province}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01' )) kpbn,
-		(
-		SELECT
-		sum(ps.payment_amount)
-		FROM
-		payment_slip ps,
-		business_customer bc
-		WHERE
-		ps.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND bc.id = ps.bus_guest_id
-		  AND ps.comp_id = #{compId}
-		  AND bc.province=#{province}
-		AND ps.payment_time &gt;= CURDATE()
-		AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) skbr,
-		(
-		SELECT
-		sum(ps.payment_amount)
-		FROM
-		payment_slip ps,
-		business_customer bc
-		WHERE
-		ps.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND bc.id = ps.bus_guest_id
-		  AND ps.comp_id = #{compId}
-		  AND bc.province=#{province}
-		AND ps.payment_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ps.payment_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) skby,
-		(
-		SELECT
-		sum(ps.payment_amount)
-		FROM
-		payment_slip ps,
-		business_customer bc
-		WHERE
-		ps.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND bc.id = ps.bus_guest_id
-		  AND ps.comp_id = #{compId}
-		  AND bc.province=#{province}
-		AND ps.payment_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ps.payment_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01' )) skbn,
-		(
-		SELECT
-			sum( c.amount )
-		FROM
-		contract c
-		LEFT JOIN business_customer bc ON bc.id = c.party_a_id
-		WHERE
-		    c.del_flag = '0'
-			AND c.party_b_id = #{compId}
-			AND bc.province=#{province}
-		AND c.sign_date &gt;= CURDATE()
-		AND c.sign_date &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) htbr,
-		(
-		SELECT
-			sum( c.amount )
-		FROM
-		contract c
-		LEFT JOIN business_customer bc ON bc.id = c.party_a_id
-		WHERE
-			c.del_flag = '0'
-		  AND c.party_b_id = #{compId}
-		  AND bc.province=#{province}
-		AND c.sign_date &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND c.sign_date &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) htby,
-		(
-		SELECT
-			sum( c.amount )
-		FROM
-		contract c
-		LEFT JOIN business_customer bc ON bc.id = c.party_a_id
-		WHERE
-			c.del_flag = '0'
-		  AND c.party_b_id = #{compId}
-		  AND bc.province=#{province}
-		AND c.sign_date &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND c.sign_date &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01' )) htbn
+	<select id="homeZgsData" resultType="com.by4cloud.platformx.business.vo.HomeZgsData">
+		SELECT (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND c.party_b_id = #{compId}
+					 AND bc.province = #{province}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            kpbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND c.party_b_id = #{compId}
+					 AND bc.province = #{province}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) kpby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND c.party_b_id = #{compId}
+					 AND bc.province = #{province}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01'))  kpbn,
+			   (
+				   SELECT sum(ps.payment_amount)
+				   FROM payment_slip ps,
+						business_customer bc
+				   WHERE ps.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = ps.bus_guest_id
+					 AND ps.comp_id = #{compId}
+					 AND bc.province = #{province}
+					 AND ps.payment_time &gt;= CURDATE()
+					 AND ps.payment_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            skbr,
+			   (
+				   SELECT sum(ps.payment_amount)
+				   FROM payment_slip ps,
+						business_customer bc
+				   WHERE ps.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = ps.bus_guest_id
+					 AND ps.comp_id = #{compId}
+					 AND bc.province = #{province}
+					 AND ps.payment_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ps.payment_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) skby,
+			   (
+				   SELECT sum(ps.payment_amount)
+				   FROM payment_slip ps,
+						business_customer bc
+				   WHERE ps.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = ps.bus_guest_id
+					 AND ps.comp_id = #{compId}
+					 AND bc.province = #{province}
+					 AND ps.payment_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ps.payment_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01'))  skbn,
+			   (
+				   SELECT sum(c.amount)
+				   FROM contract c
+							LEFT JOIN business_customer bc ON bc.id = c.party_a_id
+				   WHERE c.del_flag = '0'
+					 AND c.party_b_id = #{compId}
+					 AND bc.province = #{province}
+					 AND c.sign_date &gt;= CURDATE()
+					 AND c.sign_date &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                                htbr,
+			   (
+				   SELECT sum(c.amount)
+				   FROM contract c
+							LEFT JOIN business_customer bc ON bc.id = c.party_a_id
+				   WHERE c.del_flag = '0'
+					 AND c.party_b_id = #{compId}
+					 AND bc.province = #{province}
+					 AND c.sign_date &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND c.sign_date &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01'))     htby,
+			   (
+				   SELECT sum(c.amount)
+				   FROM contract c
+							LEFT JOIN business_customer bc ON bc.id = c.party_a_id
+				   WHERE c.del_flag = '0'
+					 AND c.party_b_id = #{compId}
+					 AND bc.province = #{province}
+					 AND c.sign_date &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND c.sign_date &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01'))      htbn
 	</select>
-    <select id="zbjtStatisticByInvoice" resultType="com.by4cloud.platformx.business.vo.ZbjtStatisticVo">
-		SELECT
-		(
-		SELECT
-		IFNULL(sum( ci.invoice_total_price_tax ) ,0)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
-		) AS br,
-		(
-		SELECT
-		IFNULL(sum( ci.invoice_total_price_tax ) ,0)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
+	<select id="zbjtStatisticByInvoice" resultType="com.by4cloud.platformx.business.vo.ZbjtStatisticVo">
+		SELECT (
+				   SELECT IFNULL(sum(ci.invoice_total_price_tax), 0)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY )
+			   ) AS br,
+			   (
+				   SELECT IFNULL(sum(ci.invoice_total_price_tax), 0)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
 
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )
-		) AS bm,
-		(
-		SELECT
-		IFNULL(sum( ci.invoice_total_price_tax ) ,0)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')
+			   ) AS bm,
+			   (
+				   SELECT IFNULL(sum(ci.invoice_total_price_tax), 0)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
 
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
-		) AS bn
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01')
+			   ) AS bn
 	</select>
 	<select id="zbjtIndicatorTrend" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
 		WITH RECURSIVE month_series AS (
-		SELECT
-		DATE( #{startMon} ) AS month_start UNION ALL
-		SELECT
-		DATE_ADD( month_start, INTERVAL 1 MONTH )
-		FROM
-		month_series
-		WHERE
-		month_start &lt; DATE(#{endMon} )
-		) SELECT
-		DATE_FORMAT( ms.month_start, '%Y-%m' ) AS `yearMon`,
-		COALESCE ( SUM( c.invoice_total_price_tax ), 0 ) AS `je`
-		FROM
-		month_series ms
-		LEFT JOIN contract_invoice c ON DATE_FORMAT( c.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
-		GROUP BY
-		ms.month_start
-		ORDER BY
-		ms.month_start;
+			SELECT
+			DATE ( #{startMon} ) AS month_start
+		UNION ALL
+		SELECT DATE_ADD(month_start, INTERVAL 1 MONTH )
+		FROM month_series
+		WHERE month_start &lt; DATE (#{endMon} )
+			)
+		SELECT DATE_FORMAT(ms.month_start, '%Y-%m')        AS `yearMon`,
+			   COALESCE(SUM(c.invoice_total_price_tax), 0) AS `je`
+		FROM month_series ms
+				 LEFT JOIN contract_invoice c
+						   ON DATE_FORMAT(c.invoice_time, '%Y-%m') = DATE_FORMAT(ms.month_start, '%Y-%m')
+		GROUP BY ms.month_start
+		ORDER BY ms.month_start;
 	</select>
 	<select id="zbjtPlanAchieced" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
-		WITH RECURSIVE month_series AS (
-			SELECT
-				DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
-			SELECT
-				DATE_SUB( month_start, INTERVAL 1 MONTH )
-			FROM
-				month_series
-			WHERE
-				month_start &gt; DATE_SUB( DATE_FORMAT( CURDATE(), '%Y-%m-01' ), INTERVAL 11 MONTH )
-		) SELECT
-			  DATE_FORMAT( ms.month_start, '%m' ) AS `yearMon`,
-			  COALESCE ( SUM( ci.invoice_total_price_tax ), 0 ) AS `je`
-		FROM
-			month_series ms
-				LEFT JOIN contract_invoice ci ON DATE_FORMAT( ci.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
-				AND ci.del_flag = '0'
-				<if test="compId !=null">
-					AND ci.comp_id = #{compId}
-				</if>
-		GROUP BY
-			ms.month_start
-		ORDER BY
-			ms.month_start ASC;
-	</select>
-	<select id="zbjtPlanAchiecedSmj" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
 		WITH RECURSIVE month_series AS (
 		SELECT
 		DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
@@ -825,12 +764,287 @@
 		COALESCE ( SUM( ci.invoice_total_price_tax ), 0 ) AS `je`
 		FROM
 		month_series ms
-		LEFT JOIN contract_invoice ci ON DATE_FORMAT( ci.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
+		LEFT JOIN contract_invoice ci ON DATE_FORMAT( ci.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m'
+		)
 		AND ci.del_flag = '0'
-			AND (ci.comp_id = 2089995177814495234 or ci.comp_id = 2089996921978040321 or ci.comp_id = 2089997578009128962 or ci.comp_id = 2101966257365045249)
+		<if test="compId !=null">
+			AND ci.comp_id = #{compId}
+		</if>
 		GROUP BY
 		ms.month_start
 		ORDER BY
 		ms.month_start ASC;
 	</select>
+	<select id="zbjtPlanAchiecedSmj" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
+		WITH RECURSIVE month_series AS (
+			SELECT DATE_FORMAT(CURDATE(), '%Y-%m-01') AS month_start
+			UNION ALL
+			SELECT DATE_SUB(month_start, INTERVAL 1 MONTH )
+			FROM month_series
+			WHERE month_start &gt; DATE_SUB(DATE_FORMAT(CURDATE(), '%Y-%m-01'), INTERVAL 11 MONTH )
+		)
+		SELECT DATE_FORMAT(ms.month_start, '%m')            AS `yearMon`,
+			   COALESCE(SUM(ci.invoice_total_price_tax), 0) AS `je`
+		FROM month_series ms
+				 LEFT JOIN contract_invoice ci
+						   ON DATE_FORMAT(ci.invoice_time, '%Y-%m') = DATE_FORMAT(ms.month_start, '%Y-%m')
+							   AND ci.del_flag = '0'
+							   AND (ci.comp_id = 2089995177814495234 or ci.comp_id = 2089996921978040321 or
+									ci.comp_id = 2089997578009128962 or ci.comp_id = 2101966257365045249)
+		GROUP BY ms.month_start
+		ORDER BY ms.month_start ASC;
+	</select>
+	<select id="homeZbjtYearAndMon" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
+		SELECT
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556196124250113
+				 AND ci.invoice_time &gt;= #{startMon}
+				 AND ci.invoice_time &lt; #{endMon}) sgbby,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556196124250113
+				 AND ci.invoice_time &gt;=#{startYear}
+				 AND ci.invoice_time &lt;#{endYear})  sgbbn,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				 AND ci.invoice_time &gt;= #{startMon}
+				 AND ci.invoice_time &lt; #{endMon}) smjby,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				 AND ci.invoice_time &gt;=#{startYear}
+				 AND ci.invoice_time &lt;#{endYear})  smjbn,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556317461270529
+				 AND ci.invoice_time &gt;= #{startMon}
+				 AND ci.invoice_time &lt; #{endMon}) jxcby,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556317461270529
+				 AND ci.invoice_time &gt;=#{startYear}
+				 AND ci.invoice_time &lt;#{endYear})  jxcbn,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556421857497090
+				 AND ci.invoice_time &gt;= #{startMon}
+				 AND ci.invoice_time &lt; #{endMon}) tfby,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556421857497090
+				 AND ci.invoice_time &gt;=#{startYear}
+				 AND ci.invoice_time &lt;#{endYear})  tfbn,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556535640576002
+				 AND ci.invoice_time &gt;= #{startMon}
+				 AND ci.invoice_time &lt; #{endMon}) ymjby,
+		   (
+			   SELECT IFNULL(sum(ci.invoice_total_price_tax),0)
+			   FROM contract_invoice ci
+			   WHERE ci.del_flag = '0'
+				 AND comp_id = 2056556535640576002
+				 AND ci.invoice_time &gt;=#{startYear}
+				 AND ci.invoice_time &lt;#{endYear})  ymjbn
+	</select>
+	<select id="pjsxywwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'閰嶄欢' yw,
+			'閿�鍞敹鍏�' lb,
+			'鐭崇叅鏈�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute =  #{type}
+				AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 )
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+		UNION ALL
+		SELECT
+			'閰嶄欢' yw,
+			'閿�鍞敹鍏�' lb,
+			'鐭冲伐娉�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute =  #{type}
+				AND c.comp_id = 2056556196124250113
+
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+		UNION ALL
+		SELECT
+			'閰嶄欢' yw,
+			'閿�鍞敹鍏�' lb,
+			'閭㈠彴鍘�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute =  #{type}
+				AND c.comp_id = 2056556317461270529
+
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+		UNION ALL
+		SELECT
+			'閰嶄欢' yw,
+			'閿�鍞敹鍏�' lb,
+			'閫氭柟鍘�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute = #{type}
+				AND c.comp_id = 2056556421857497090
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+	</select>
+	<select id="dxsxywwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'澶т慨' yw,
+			'閿�鍞敹鍏�' lb,
+			'鐭崇叅鏈�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute =  #{type}
+				AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 )
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+		UNION ALL
+		SELECT
+			'澶т慨' yw,
+			'閿�鍞敹鍏�' lb,
+			'鐭冲伐娉�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute =  #{type}
+				AND c.comp_id = 2056556196124250113
+
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+		UNION ALL
+		SELECT
+			'澶т慨' yw,
+			'閿�鍞敹鍏�' lb,
+			'閭㈠彴鍘�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute =  #{type}
+				AND c.comp_id = 2056556317461270529
+
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+		UNION ALL
+		SELECT
+			'澶т慨' yw,
+			'閿�鍞敹鍏�' lb,
+			'閫氭柟鍘�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				LEFT JOIN contract c ON c.id = ci.contract_id
+				AND c.supply_attribute = #{type}
+				AND c.comp_id = 2056556421857497090
+		WHERE
+			ci.del_flag = '0'
+		  AND ci.invoice_time &gt;= #{monstart}
+		  AND ci.invoice_time &lt;= #{monend}
+	</select>
+	<select id="cksxywwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'鍑哄彛' yw,
+			'閿�鍞敹鍏�' lb,
+			'鐭崇叅鏈�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				INNER JOIN contract c ON c.id = ci.contract_id
+				AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 )
+				INNER JOIN business_customer bc ON bc.id = c.party_a_id
+				AND bc.export_service_attr = '2'
+		WHERE
+			ci.del_flag = '0' UNION ALL
+		SELECT
+			'鍑哄彛' yw,
+			'閿�鍞敹鍏�' lb,
+			'鐭冲伐娉�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				INNER JOIN contract c ON c.id = ci.contract_id
+				AND c.comp_id = 2056556196124250113
+				INNER JOIN business_customer bc ON bc.id = c.party_a_id
+				AND bc.export_service_attr = '2'
+		WHERE
+			ci.del_flag = '0' UNION ALL
+		SELECT
+			'鍑哄彛' yw,
+			'閿�鍞敹鍏�' lb,
+			'閭㈠彴鍘�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				INNER JOIN contract c ON c.id = ci.contract_id
+				AND c.comp_id = 2056556317461270529
+				INNER JOIN business_customer bc ON bc.id = c.party_a_id
+				AND bc.export_service_attr = '2'
+		WHERE
+			ci.del_flag = '0' UNION ALL
+		SELECT
+			'鍑哄彛' yw,
+			'閿�鍞敹鍏�' lb,
+			'閫氭柟鍘�' dw,
+			IFNULL(sum( invoice_total_price_tax ),0) wc
+		FROM
+			contract_invoice ci
+				INNER JOIN contract c ON c.id = ci.contract_id
+				AND c.comp_id = 2056556421857497090
+				INNER JOIN business_customer bc ON bc.id = c.party_a_id
+				AND bc.export_service_attr = '2'
+		WHERE
+			ci.del_flag = '0'
+	</select>
 </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 a8d0ad9..1061806 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
@@ -1208,8 +1208,8 @@
 		contract c
 		WHERE
 		c.del_flag = '0'
-		AND comp_id = 2089995177814495234
-		AND c.sign_date &gt;= CURDATE()
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+		  AND c.sign_date &gt;= CURDATE()
 		AND c.sign_date &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) smjbr,
 		(
 		SELECT
@@ -1218,8 +1218,8 @@
 		contract c
 		WHERE
 		c.del_flag = '0'
-		AND comp_id = 2089995177814495234
-		AND c.sign_date &gt;=DATE_FORMAT( CURDATE(), '%Y-%m-01' )
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+		  AND c.sign_date &gt;=DATE_FORMAT( CURDATE(), '%Y-%m-01' )
 		AND c.sign_date &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
 		(
 		SELECT
@@ -1228,7 +1228,7 @@
 		contract c
 		WHERE
 		c.del_flag = '0'
-		AND comp_id = 2089995177814495234
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
 		AND c.sign_date &gt;=DATE_FORMAT( CURDATE(), '%Y-01-01' )
 		AND c.sign_date &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
 		(
@@ -2085,4 +2085,270 @@
 		ORDER BY
 		c.create_time DESC
 	</select>
+    <select id="homeZbjtYearAndMon" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
+		SELECT
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND c.sign_date &gt;= #{startMon}
+				  AND c.sign_date &lt; #{endMon}) sgbby,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND c.sign_date &gt;= #{startYear}
+				  AND c.sign_date &lt; #{endYear}) sgbbn,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND c.sign_date &gt;= #{startMon}
+				  AND c.sign_date &lt; #{endMon}) smjby,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND c.sign_date &gt;= #{startYear}
+				  AND c.sign_date &lt; #{endYear}) smjbn,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND c.sign_date &gt;= #{startMon}
+				  AND c.sign_date &lt; #{endMon}) jxcby,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND c.sign_date &gt;= #{startYear}
+				  AND c.sign_date &lt; #{endYear}) jxcbn,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND c.sign_date &gt;= #{startMon}
+				  AND c.sign_date &lt; #{endMon}) tfby,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND c.sign_date &gt;= #{startYear}
+				  AND c.sign_date &lt; #{endYear}) tfbn,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND c.sign_date &gt;= #{startMon}
+				  AND c.sign_date &lt; #{endMon}) ymjby,
+			(
+				SELECT
+					IFNULL(sum( c.amount ),0)
+				FROM
+					contract c
+				WHERE
+					c.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND c.sign_date &gt;= #{startYear}
+				  AND c.sign_date &lt; #{endYear}) ymjbn
+	</select>
+    <select id="pjsxywwcqkHT" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'閰嶄欢' yw,
+			'鏂板鍚堝悓' lb,
+			'鐭崇叅鏈�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 ) UNION ALL
+		SELECT
+			'閰嶄欢' yw,
+			'鏂板鍚堝悓' lb,
+			'鐭冲伐娉�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556196124250113 UNION ALL
+		SELECT
+			'閰嶄欢' yw,
+			'鏂板鍚堝悓' lb,
+			'閭㈠彴鍘�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556317461270529 UNION ALL
+		SELECT
+			'閰嶄欢' yw,
+			'鏂板鍚堝悓' lb,
+			'閫氭柟鍘�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556421857497090
+	</select>
+	<select id="cksxywwcqkHT" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'鍑哄彛' yw,
+			'鏂板鍚堝悓' lb,
+			'鐭崇叅鏈�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+				left join business_customer bc on bc.id=c.party_a_id and bc.export_service_attr=#{type}
+		WHERE
+			c.del_flag = '0'
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 ) UNION ALL
+		SELECT
+			'鍑哄彛' yw,
+			'鏂板鍚堝悓' lb,
+			'鐭冲伐娉�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+				left join business_customer bc on bc.id=c.party_a_id and bc.export_service_attr=#{type}
+
+		WHERE
+			c.del_flag = '0'
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556196124250113 UNION ALL
+		SELECT
+			'鍑哄彛' yw,
+			'鏂板鍚堝悓' lb,
+			'閭㈠彴鍘�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+				left join business_customer bc on bc.id=c.party_a_id and bc.export_service_attr=#{type}
+		WHERE
+			c.del_flag = '0'
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556317461270529 UNION ALL
+		SELECT
+			'鍑哄彛' yw,
+			'鏂板鍚堝悓' lb,
+			'閫氭柟鍘�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+				left join business_customer bc on bc.id=c.party_a_id and bc.export_service_attr=#{type}
+		WHERE
+			c.del_flag = '0'
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556421857497090
+	</select>
+	<select id="dxsxywwcqkHT" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'澶т慨' yw,
+			'鏂板鍚堝悓' lb,
+			'鐭崇叅鏈�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 ) UNION ALL
+		SELECT
+			'澶т慨' yw,
+			'鏂板鍚堝悓' lb,
+			'鐭冲伐娉�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556196124250113 UNION ALL
+		SELECT
+			'澶т慨' yw,
+			'鏂板鍚堝悓' lb,
+			'閭㈠彴鍘�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556317461270529 UNION ALL
+		SELECT
+			'澶т慨' yw,
+			'鏂板鍚堝悓' lb,
+			'閫氭柟鍘�' dw,
+			IFNULL( sum( amount ), 0 ) wc
+		FROM
+			contract c
+		WHERE
+			c.del_flag = '0'
+		  AND c.supply_attribute = #{type}
+		  AND c.sign_date &gt;= #{monstart}
+		  AND c.sign_date &lt;= #{monend}
+		  AND c.comp_id = 2056556421857497090
+	</select>
 </mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
index 57c4e28..0111ff9 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
@@ -1307,7 +1307,8 @@
 		t.comp_id,
 		t1.contract_no,
 		t2.company_name AS busGuestName,
-		t3.unit_price
+		t3.unit_price,
+		t4.batch_number
 		FROM
 		contract_out_bound t
 		LEFT JOIN contract t1 ON ( t1.id = t.contract_id AND t1.del_flag = '0' )
@@ -1315,6 +1316,7 @@
 		LEFT JOIN contract_subject_matter t3 ON t3.contract_id = t.contract_id
 		AND t3.material_code = t.subject_matter_code
 		AND t3.del_flag = '0'
+		LEFT JOIN out_bound t4 ON t4.id = t.out_bound_id
 		WHERE
 		t.del_flag = '0'
 		<if test="queryDTO.queryCompId !=null and queryDTO.queryCompId !=''">
@@ -1322,6 +1324,9 @@
 		</if>
 		<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
 			AND t1.contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
+		</if>
+		<if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
+			AND t1.contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
 		</if>
 		<if test="queryDTO.busGuestName !=null and queryDTO.busGuestName !=''">
 			AND t2.company_name LIKE CONCAT('%', #{queryDTO.busGuestName}, '%')
@@ -1434,4 +1439,39 @@
 		ORDER BY
 		t.create_time DESC
 	</select>
+    <select id="gcpbkwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			d.dict_name AS bkmc,
+			IFNULL(sum(c.unit_price*c.advance_num+c.unit_price*c.out_bound_num),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_out_bound c
+			ON
+				d.dict_code = c.product_section  and c.del_flag = '0'
+					and c.out_bound_time &gt;= #{start}
+					and c.out_bound_time &lt;= #{end}
+		WHERE
+			d.dict_key = 'zb-cpbk'
+		GROUP BY
+			d.dict_name, d.dict_key;
+	</select>
+    <select id="cpxssrwcqk" resultType="com.by4cloud.platformx.business.vo.CpxssrwcqkItemVo">
+		SELECT
+			d.dict_name AS xm,
+			IFNULL( sum( c.advance_num+ c.out_bound_num), 0 ) AS xsl,
+			IFNULL(sum(c.unit_price*c.advance_num+c.unit_price*c.out_bound_num),0) AS xssr
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_out_bound c
+			ON
+						d.dict_code = c.product_section  and c.del_flag = '0'
+					and c.out_bound_time &gt;= #{monstart}
+					and c.out_bound_time &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-cpbk'
+		GROUP BY
+			d.dict_name, d.dict_key;
+	</select>
 </mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml
index b0a7b2e..4e3804a 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml
@@ -37,4 +37,195 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
   </resultMap>
+    <select id="gcpbkwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			d.dict_name AS bkmc,
+			IFNULL(sum(c.unit_price*c.quantity),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_subject_matter c
+
+			ON
+				d.dict_code = c.product_section and c.del_flag = '0'
+				LEFT JOIN
+			contract c1
+			ON
+				c.contract_id = c1.id and c1.del_flag = '0'
+					and c1.sign_date &gt;= #{monstart}
+					and c1.sign_date &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-cpbk'
+		GROUP BY
+			d.dict_name, d.dict_key;
+
+	</select>
+	<select id="gcpbkwcqkBySK" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			d.dict_name AS bkmc,
+			IFNULL(ROUND(SUM(
+									 IFNULL(pay.total_paid, 0) *
+									 (agg.sub_total / NULLIF(IFNULL(c1.amount, 0), 0))
+							 ), 2), 0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN (
+				SELECT
+					c.product_section,
+					c.contract_id,
+					SUM(c.unit_price * c.quantity) AS sub_total
+				FROM
+					contract_subject_matter c
+				WHERE
+					c.del_flag = '0'
+				GROUP BY
+					c.product_section, c.contract_id
+			) agg ON d.dict_code = agg.product_section
+				LEFT JOIN
+			contract c1
+			ON
+						agg.contract_id = c1.id
+					AND c1.del_flag = '0'
+				LEFT JOIN (
+				SELECT
+					contract_id,
+					SUM(payment_amount) AS total_paid
+				FROM
+					payment_slip
+				WHERE
+					del_flag = '0'
+				  and payment_time &gt;= #{monstart}
+				  and payment_time &lt;= #{monend}
+				GROUP BY
+					contract_id
+			) pay ON c1.id = pay.contract_id
+		WHERE
+			d.dict_key = 'zb-cpbk'
+		GROUP BY
+			d.dict_name;
+
+	</select>
+	<select id="sckfzdgzwcqk" resultType="com.by4cloud.platformx.business.vo.GcpbkwcqkItemVo">
+		SELECT
+			'鐭崇叅鏈�' dw,
+			d.dict_code `code`,
+			d.dict_name AS xm,
+			IFNULL(sum(c.unit_price*c.quantity),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_subject_matter c
+
+			ON
+						d.dict_code = c.product_section and c.del_flag = '0'
+					AND (c.comp_id = 2089995177814495234 or c.comp_id = 2089996921978040321 or c.comp_id = 2089997578009128962 or c.comp_id = 2101966257365045249)
+				LEFT JOIN
+			contract c1
+			ON
+				c.contract_id = c1.id and c1.del_flag = '0'
+					and c1.sign_date &gt;= #{monstart}
+					and c1.sign_date &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-ywxm'
+		  AND (d.comp_id = 2089995177814495234 or d.comp_id = 2089996921978040321 or d.comp_id = 2089997578009128962 or d.comp_id = 2101966257365045249)
+		GROUP BY
+			d.dict_name,d.dict_code, d.dict_key
+		union all
+		SELECT
+			'鐭冲伐娉�' dw,
+			d.dict_code `code`,
+			d.dict_name AS bkmc,
+			IFNULL(sum(c.unit_price*c.quantity),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_subject_matter c
+
+			ON
+						d.dict_code = c.product_section and c.del_flag = '0'
+					AND c.comp_id = 2056556196124250113
+				LEFT JOIN
+			contract c1
+			ON
+				c.contract_id = c1.id and c1.del_flag = '0'
+					and c1.sign_date &gt;= #{monstart}
+					and c1.sign_date &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-ywxm'
+		  AND d.comp_id = 2056556196124250113
+		GROUP BY
+			d.dict_name,d.dict_code, d.dict_key
+		union all
+		SELECT
+			'閭㈠彴鍘�' dw,
+			d.dict_code `code`,
+			d.dict_name AS bkmc,
+			IFNULL(sum(c.unit_price*c.quantity),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_subject_matter c
+
+			ON
+						d.dict_code = c.product_section and c.del_flag = '0'
+					AND c.comp_id = 2056556317461270529
+				LEFT JOIN
+			contract c1
+			ON
+				c.contract_id = c1.id and c1.del_flag = '0'
+					and c1.sign_date &gt;= #{monstart}
+					and c1.sign_date &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-ywxm'
+		  AND d.comp_id = 2056556317461270529
+		GROUP BY
+			d.dict_name,d.dict_code, d.dict_key
+		union all
+		SELECT
+			'閫氭柟鍘�' dw,
+			d.dict_code `code`,
+			d.dict_name AS bkmc,
+			IFNULL(sum(c.unit_price*c.quantity),0) AS wc
+		FROM
+			bip_dict d
+				LEFT JOIN
+			contract_subject_matter c
+
+			ON
+						d.dict_code = c.product_section and c.del_flag = '0'
+					AND c.comp_id = 2056556421857497090
+				LEFT JOIN
+			contract c1
+			ON
+				c.contract_id = c1.id and c1.del_flag = '0'
+					and c1.sign_date &gt;= #{monstart}
+					and c1.sign_date &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-ywxm'
+		  AND d.comp_id = 2056556421857497090
+		GROUP BY
+			d.dict_name,d.dict_code, d.dict_key
+
+	</select>
+	<select id="cpxzhtwcqk" resultType="com.by4cloud.platformx.business.vo.CpxssrwcqkItemVo">
+		SELECT
+			d.dict_name AS xm,
+			IFNULL( sum( c.quantity ), 0 ) AS xsl,
+			IFNULL( sum( c.unit_price * c.quantity ), 0 ) AS xssr
+		FROM
+			bip_dict d
+				LEFT JOIN contract_subject_matter c ON d.dict_code = c.product_category
+				AND c.del_flag = '0'
+				LEFT JOIN contract c1 ON c.contract_id = c1.id
+				AND c1.del_flag = '0'
+				and c1.sign_date &gt;= #{monstart}
+				and c1.sign_date &lt;= #{monend}
+		WHERE
+			d.dict_key = 'zb-cpmc'
+		  	and d.comp_id = 2089995177814495234
+		GROUP BY
+			d.dict_name,
+			d.dict_key;
+	</select>
+
 </mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/HistoryOverdueMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/HistoryOverdueMapper.xml
index 2153f4d..f61836c 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/HistoryOverdueMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/HistoryOverdueMapper.xml
@@ -3,474 +3,364 @@
 
 <mapper namespace="com.by4cloud.platformx.business.mapper.HistoryOverdueMapper">
 
-  <resultMap id="historyOverdueMap" type="com.by4cloud.platformx.business.entity.HistoryOverdue">
-        <id property="id" column="id"/>
-        <result property="compId" column="comp_id"/>
-        <result property="busGuestId" column="bus_guest_id"/>
-        <result property="busGuestName" column="bus_guest_name"/>
-        <result property="contractExpirTime" column="create_time"/>
-        <result property="contractId" column="contract_id"/>
-        <result property="contractName" column="contract_name"/>
-        <result property="overdueDuration" column="overdue_duration"/>
-        <result property="paymentTime" column="payment_time"/>
-        <result property="receivableAmount" column="receivable_amount"/>
-        <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>
-    <select id="homeZbjt" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
-		SELECT
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556196124250113
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) sgbbr,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556196124250113
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) sgbby,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556196124250113
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) sgbbn,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2089995177814495234
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) smjbr,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2089995177814495234
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2089995177814495234
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556317461270529
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) jxcbr,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556317461270529
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) jxcby,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556317461270529
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) jxcbn,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556421857497090
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) tfbr,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556421857497090
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) tfby,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556421857497090
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) tfbn,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556535640576002
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) ymjbr,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556535640576002
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) ymjby,
-			(
-				SELECT
-					sum(co.receivable_amount)
-				FROM
-					history_overdue co
-				WHERE
-					co.del_flag = '0'
-				  AND comp_id = 2056556535640576002
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) ymjbn
+	<resultMap id="historyOverdueMap" type="com.by4cloud.platformx.business.entity.HistoryOverdue">
+		<id property="id" column="id"/>
+		<result property="compId" column="comp_id"/>
+		<result property="busGuestId" column="bus_guest_id"/>
+		<result property="busGuestName" column="bus_guest_name"/>
+		<result property="contractExpirTime" column="create_time"/>
+		<result property="contractId" column="contract_id"/>
+		<result property="contractName" column="contract_name"/>
+		<result property="overdueDuration" column="overdue_duration"/>
+		<result property="paymentTime" column="payment_time"/>
+		<result property="receivableAmount" column="receivable_amount"/>
+		<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>
+	<select id="homeZbjt" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
+		SELECT (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556196124250113
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            sgbbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556196124250113
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) sgbby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556196124250113
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  sgbbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2089995177814495234
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            smjbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2089995177814495234
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) smjby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2089995177814495234
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  smjbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556317461270529
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            jxcbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556317461270529
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) jxcby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556317461270529
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  jxcbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556421857497090
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            tfbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556421857497090
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) tfby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556421857497090
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  tfbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556535640576002
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            ymjbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556535640576002
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) ymjby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co
+				   WHERE co.del_flag = '0'
+					 AND comp_id = 2056556535640576002
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  ymjbn
 	</select>
 	<select id="homeZgs" resultType="com.by4cloud.platformx.business.vo.HomeZgsVo">
-		SELECT
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '2'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) hbbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '2'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) hbby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '2'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) hbbn,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '6'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) xbbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '6'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) xbby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '6'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) xbbn,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '1'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) dbbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '1'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) dbby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '1'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) dbbn,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '3'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) hdbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '3'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) hdby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '3'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) hdbn,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '4'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) znbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '4'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) znby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '4'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) znbn,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '5'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) xnbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '5'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) xnby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.area_id = '5'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) xnbn,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.export_service_attr = '2'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= CURDATE()
-				  AND co.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) hwbr,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.export_service_attr = '2'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) hwby,
-			(
-				SELECT
-					sum( co.receivable_amount )
-				FROM
-					history_overdue co,
-					business_customer bc
-				WHERE
-					co.del_flag = '0'
-				  AND bc.del_flag = '0'
-				  AND bc.id = co.bus_guest_id
-				  AND bc.export_service_attr = '2'
-				  AND co.comp_id = #{compId}
-				  AND co.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-				  AND co.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) hwbn
+		SELECT (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '2'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            hbbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '2'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) hbby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '2'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  hbbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '6'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            xbbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '6'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) xbby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '6'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  xbbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '1'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            dbbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '1'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) dbby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '1'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  dbbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '3'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            hdbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '3'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) hdby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '3'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  hdbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '4'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            znbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '4'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) znby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '4'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  znbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '5'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            xnbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '5'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) xnby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.area_id = '5'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  xnbn,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.export_service_attr = '2'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= CURDATE()
+					 AND co.create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            hwbr,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.export_service_attr = '2'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) hwby,
+			   (
+				   SELECT sum(co.receivable_amount)
+				   FROM history_overdue co,
+						business_customer bc
+				   WHERE co.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND bc.id = co.bus_guest_id
+					 AND bc.export_service_attr = '2'
+					 AND co.comp_id = #{compId}
+					 AND co.create_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND co.create_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  hwbn
 	</select>
-    <select id="selectHistoryOverdue" resultType="com.by4cloud.platformx.business.vo.HomeOverdueStaVo">
+	<select id="selectHistoryOverdue" resultType="com.by4cloud.platformx.business.vo.HomeOverdueStaVo">
 		SELECT
 		sum( receivable_amount ) receivable_amount
 		FROM
@@ -480,25 +370,25 @@
 		WHERE
 		t.del_flag = '0'
 		<if test="queryDTO.queryCompId !=null and queryDTO.queryCompId !=''">
-			AND t.comp_id =  #{queryDTO.queryCompId}
+			AND t.comp_id = #{queryDTO.queryCompId}
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='1'.toString()">
-			AND  t.create_time &gt;= CURDATE()
-			AND  t.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
+			AND t.create_time &gt;= CURDATE()
+			AND t.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='2'.toString()">
-			AND  t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			AND  t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
+			AND t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+			AND t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='3'.toString()">
-			AND  t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			AND  t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
+			AND t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+			AND t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
 		</if>
 		<if test="queryDTO.queryArea !=null and queryDTO.queryArea !=''">
-			AND t2.class_id =  #{queryDTO.queryArea}
+			AND t2.class_id = #{queryDTO.queryArea}
 		</if>
 		<if test="queryDTO.queryServiceAttr !=null and queryDTO.queryServiceAttr !=''">
-			AND t2.export_service_attr =  #{queryDTO.queryServiceAttr}
+			AND t2.export_service_attr = #{queryDTO.queryServiceAttr}
 		</if>
 		GROUP BY
 		t.comp_id
@@ -524,7 +414,7 @@
 		WHERE
 		t.del_flag = '0'
 		<if test="queryDTO.queryCompId !=null and queryDTO.queryCompId !=''">
-			AND t.comp_id =  #{queryDTO.queryCompId}
+			AND t.comp_id = #{queryDTO.queryCompId}
 		</if>
 		<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
 			AND t1.contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
@@ -536,28 +426,442 @@
 			AND t.schedule_name LIKE CONCAT('%', #{queryDTO.scheduleName}, '%')
 		</if>
 		<if test="queryDTO.queryArea !=null and queryDTO.queryArea !=''">
-			AND t2.class_id =  #{queryDTO.queryArea}
+			AND t2.class_id = #{queryDTO.queryArea}
 		</if>
 		<if test="queryDTO.queryServiceAttr !=null and queryDTO.queryServiceAttr !=''">
-			AND t2.export_service_attr =  #{queryDTO.queryServiceAttr}
+			AND t2.export_service_attr = #{queryDTO.queryServiceAttr}
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='1'.toString()">
-			AND  t.create_time &gt;= CURDATE()
-			AND  t.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
+			AND t.create_time &gt;= CURDATE()
+			AND t.create_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='2'.toString()">
-			AND  t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			AND  t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
+			AND t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+			AND t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='3'.toString()">
-			AND  t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			AND  t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
+			AND t.create_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+			AND t.create_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
 		</if>
 		<if test="queryDTO.startTime !=null and queryDTO.endTime !=null">
-			AND  t.create_time &gt;=  #{queryDTO.startTime}
-			AND  t.create_time &lt;=  #{queryDTO.endTime}
+			AND t.create_time &gt;= #{queryDTO.startTime}
+			AND t.create_time &lt;= #{queryDTO.endTime}
 		</if>
 		ORDER BY
 		t.create_time DESC
 	</select>
+	<select id="snqqwcqk" resultType="com.by4cloud.platformx.business.vo.SnqqwcqkVo">
+		SELECT '鐭崇叅鏈�'                                            dw,
+			   '3骞�'                                             xm,
+			   '1'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+							 AND payment_time &gt;= #{monstart}
+							 AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            ljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							 ),0) ljwcqh
+		UNION ALL
+		SELECT '鐭崇叅鏈�'                                            dw,
+			   '3骞翠互涓�'                                           xm,
+			   '2'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '鐭崇叅鏈�'                                            dw,
+			   '灏忚'                                           xm,
+			   ''                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '鐭冲伐娉�'                                            dw,
+			   '3骞�'                                             xm,
+			   '1'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+			       AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ) ,0) dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND overdue_duration &lt;= 1095
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND overdue_duration &lt;= 1095
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '鐭冲伐娉�'                                            dw,
+			   '3骞翠互涓�'                                           xm,
+			   '2'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '鐭冲伐娉�'                                            dw,
+			   '灏忚'                                           xm,
+			   ''                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '閭㈠彴鍘�'                                            dw,
+			   '3骞�'                                             xm,
+			   '1'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				   AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				   AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							 ),0) ljwcqh
+		UNION ALL
+		SELECT '閭㈠彴鍘�'                                            dw,
+			   '3骞翠互涓�'                                           xm,
+			   '2'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							) ,0) dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							 ),0) ljwcqh
+		UNION ALL
+		SELECT '閭㈠彴鍘�'                                            dw,
+			   '灏忚'                                           xm,
+			   ''                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            lqwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '閫氭柟鍘�'                                            dw,
+			   '3骞�'                                             xm,
+			   '1'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL( (SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+			       AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+					),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &lt;= 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '閫氭柟鍘�'                                            dw,
+			   '3骞翠互涓�'                                           xm,
+			   '2'                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend}
+				GROUP BY bus_guest_id
+							 ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND overdue_duration &gt; 1095
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend}
+				GROUP BY bus_guest_id
+							),0) ljwcqh
+		UNION ALL
+		SELECT '閫氭柟鍘�'                                            dw,
+			   '灏忚'                                           xm,
+			   ''                                              CODE,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{monstart}
+				  AND payment_time &lt;= #{monend})             dywcqq,
+			   IFNULL((SELECT COUNT(1)
+					   FROM history_overdue
+					   WHERE del_flag = '0'
+						 AND comp_id = 2056556421857497090
+						 AND payment_time &gt;= #{monstart}
+						 AND payment_time &lt;= #{monend}
+					   GROUP BY bus_guest_id
+					  ),0)  dywcqh,
+			   (SELECT IFNULL(sum(receivable_amount),0)
+				FROM history_overdue
+				WHERE del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND payment_time &gt;= #{yearstart}
+				  AND payment_time &lt;= #{yearend})            dljwcqq,
+			   IFNULL((SELECT COUNT(1)
+					   FROM history_overdue
+					   WHERE del_flag = '0'
+						 AND comp_id = 2056556421857497090
+						 AND payment_time &gt;= #{yearstart}
+						 AND payment_time &lt;= #{yearend}
+					   GROUP BY bus_guest_id
+					  ),0) ljwcqh
+	</select>
 </mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/PaymentReceiveMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/PaymentReceiveMapper.xml
index 8778005..b72ea5c 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/PaymentReceiveMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/PaymentReceiveMapper.xml
@@ -3,78 +3,344 @@
 
 <mapper namespace="com.by4cloud.platformx.business.mapper.PaymentReceiveMapper">
 
-  <resultMap id="paymentReceiveMap" type="com.by4cloud.platformx.business.entity.PaymentReceive">
-        <id property="id" column="id"/>
-        <result property="compId" column="comp_id"/>
-        <result property="receiveAmount" column="receive_amount"/>
-        <result property="receiveDate" column="receive_date"/>
-  </resultMap>
+	<resultMap id="paymentReceiveMap" type="com.by4cloud.platformx.business.entity.PaymentReceive">
+		<id property="id" column="id"/>
+		<result property="compId" column="comp_id"/>
+		<result property="receiveAmount" column="receive_amount"/>
+		<result property="receiveDate" column="receive_date"/>
+	</resultMap>
 	<select id="genReceivePayment" resultType="java.math.BigDecimal">
 		SELECT
-			sum(c.billing_amout - c.paid_amount)
+		sum(c.billing_amout - c.paid_amount)
 		FROM
-			contract c
+		contract c
 		WHERE
-		    c.del_flag = '0'
-			AND c.billing_amout >= paid_amount
+		c.del_flag = '0'
+		AND c.billing_amout >= paid_amount
 		<if test="compId!=null">
 			AND c.comp_id = #{compId}
 		</if>
 	</select>
 	<select id="genReceivePaymentSmj" resultType="java.math.BigDecimal">
-		SELECT
-			sum(c.billing_amout - c.paid_amount)
-		FROM
-			contract c
-		WHERE
-			c.del_flag = '0'
+		SELECT sum(c.billing_amout - c.paid_amount)
+		FROM contract c
+		WHERE c.del_flag = '0'
 		  AND c.billing_amout >= paid_amount
-		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or
+			   comp_id = 2101966257365045249)
 	</select>
 	<select id="zbjtReceiveScale" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
 		WITH RECURSIVE month_series AS (
-			SELECT
-				DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
-			SELECT
-				DATE_SUB( month_start, INTERVAL 1 MONTH )
-			FROM
-				month_series
-			WHERE
-				month_start &gt; DATE_SUB( DATE_FORMAT( CURDATE(), '%Y-%m-01' ), INTERVAL 11 MONTH )
-		) SELECT
-			  DATE_FORMAT( ms.month_start, '%m' ) AS `yearMon`,
-			  COALESCE ( SUM( ps.receive_amount ), 0 ) AS `je`
+		SELECT
+		DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
+		SELECT
+		DATE_SUB( month_start, INTERVAL 1 MONTH )
 		FROM
-			month_series ms
-				LEFT JOIN payment_receive ps ON DATE_FORMAT( ps.receive_date, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
+		month_series
+		WHERE
+		month_start &gt; DATE_SUB( DATE_FORMAT( CURDATE(), '%Y-%m-01' ), INTERVAL 11 MONTH )
+		) SELECT
+		DATE_FORMAT( ms.month_start, '%m' ) AS `yearMon`,
+		COALESCE ( SUM( ps.receive_amount ), 0 ) AS `je`
+		FROM
+		month_series ms
+		LEFT JOIN payment_receive ps ON DATE_FORMAT( ps.receive_date, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
 		<if test="compId !=null">
 			AND ps.comp_id = #{compId}
 		</if>
 		GROUP BY
-			ms.month_start
+		ms.month_start
 		ORDER BY
-			ms.month_start ASC;
+		ms.month_start ASC;
 	</select>
 	<select id="zbjtReceiveScaleSMJ" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
 		WITH RECURSIVE month_series AS (
-			SELECT
-				DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
-			SELECT
-				DATE_SUB( month_start, INTERVAL 1 MONTH )
-			FROM
-				month_series
-			WHERE
-				month_start &gt; DATE_SUB( DATE_FORMAT( CURDATE(), '%Y-%m-01' ), INTERVAL 11 MONTH )
-		) SELECT
-			  DATE_FORMAT( ms.month_start, '%m' ) AS `yearMon`,
-			  COALESCE ( SUM( ps.receive_amount ), 0 ) AS `je`
-		FROM
-			month_series ms
-				LEFT JOIN payment_receive ps ON DATE_FORMAT( ps.receive_date, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
-				AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
-		GROUP BY
-			ms.month_start
-		ORDER BY
-			ms.month_start ASC;
+			SELECT DATE_FORMAT(CURDATE(), '%Y-%m-01') AS month_start
+			UNION ALL
+			SELECT DATE_SUB(month_start, INTERVAL 1 MONTH )
+			FROM month_series
+			WHERE month_start &gt; DATE_SUB(DATE_FORMAT(CURDATE(), '%Y-%m-01'), INTERVAL 11 MONTH )
+		)
+		SELECT DATE_FORMAT(ms.month_start, '%m')   AS `yearMon`,
+			   COALESCE(SUM(ps.receive_amount), 0) AS `je`
+		FROM month_series ms
+				 LEFT JOIN payment_receive ps
+						   ON DATE_FORMAT(ps.receive_date, '%Y-%m') = DATE_FORMAT(ms.month_start, '%Y-%m')
+							   AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or
+									comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+		GROUP BY ms.month_start
+		ORDER BY ms.month_start ASC;
+	</select>
+	<select id="yszkwcqk" resultType="com.by4cloud.platformx.business.vo.YszkwcqkVo">
+		SELECT *
+		FROM (
+				 SELECT '鐭崇叅鏈�'                                       dw,
+						'搴旀敹'                                        lb,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2089995177814495234
+						   and receive_date &gt;= #{monstart}
+						   and receive_date &lt;= #{monend})        ysdy,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2089995177814495234
+						   and receive_date &gt;= #{yearstart}
+						   and receive_date &lt;= #{yearend})       ysqc,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2089995177814495234
+						   and receive_date &gt;= #{monstartLastMon}
+						   and receive_date &lt;= #{monendLastMon}) yssy
+				 UNION ALL
+				 SELECT '鐭崇叅鏈�' dw,
+						'璧婇攢'  lb,
+						(SELECT IFNULL(sum(credit_amount), 0)
+						 FROM payment_credit_sale
+						 WHERE comp_id = 2089995177814495234
+						   and credit_date &gt;= #{monstart}
+						   and credit_date &lt;= #{monend}),
+						(SELECT IFNULL(sum(credit_amount), 0)
+						 FROM payment_credit_sale
+						 WHERE comp_id = 2089995177814495234
+						   and credit_date &gt;= #{yearstart}
+						   and credit_date &lt;= #{yearend}),
+						(SELECT IFNULL(sum(credit_amount), 0)
+						 FROM payment_credit_sale
+						 WHERE comp_id = 2089995177814495234
+						   and credit_date &gt;= #{monstartLastMon}
+						   and credit_date &lt;= #{monendLastMon})
+				 UNION ALL
+				 SELECT '鐭崇叅鏈�'                                                                                       dw,
+						'灏忚'                                                                                        lb,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2089995177814495234
+						   and receive_date &gt;= #{monstart}
+						   and receive_date &lt;= #{monend}) + (SELECT IFNULL(sum(credit_amount), 0)
+																FROM payment_credit_sale
+																WHERE comp_id = 2089995177814495234
+																  and credit_date &gt;= #{monstart}
+																  and credit_date &lt;= #{monend})               AS smjysdy,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2089995177814495234
+						   and receive_date &gt;= #{yearstart}
+						   and receive_date &lt;= #{yearend}) + (SELECT IFNULL(sum(credit_amount), 0)
+																 FROM payment_credit_sale
+																 WHERE comp_id = 2089995177814495234
+																   and credit_date &gt;= #{yearstart}
+																   and credit_date &lt;= #{yearend})             AS smjysqc,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2089995177814495234
+						   and receive_date &gt;= #{monstartLastMon}
+						   and receive_date &lt;= #{monendLastMon}) + (SELECT IFNULL(sum(credit_amount), 0)
+																	   FROM payment_credit_sale
+																	   WHERE comp_id = 2089995177814495234
+																		 and credit_date &gt;= #{monstartLastMon}
+																		 and credit_date &lt;= #{monendLastMon}) AS smjyssy
+				 UNION ALL
+				 SELECT '鐭冲伐娉�' dw,
+						'搴旀敹'  lb,
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2056556196124250113
+						   and receive_date &gt;= #{monstart}
+						   and receive_date &lt;= #{monend}),
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2056556196124250113
+						   and receive_date &gt;= #{yearstart}
+						   and receive_date &lt;= #{yearend}),
+						(SELECT IFNULL(sum(receive_amount), 0)
+						 FROM payment_receive
+						 WHERE comp_id = 2056556196124250113
+						   and receive_date &gt;= #{monstartLastMon}
+						   and receive_date &lt;= #{monendLastMon})
+				 UNION ALL
+				 SELECT '鐭冲伐娉�' dw,
+						'璧婇攢'  lb,
+						(SELECT IFNULL(sum(credit_amount), 0)
+						 FROM payment_credit_sale
+						 WHERE comp_id = 2056556196124250113
+						   and credit_date &gt;= #{monstart}
+						   and credit_date &lt;= #{monend}),
+						(SELECT IFNULL(sum(credit_amount), 0)
+						 FROM payment_credit_sale
+						 WHERE comp_id = 2056556196124250113
+						   and credit_date &gt;= #{yearstart}
+						   and credit_date 	&lt;= #{yearend}),
+			 (SELECT IFNULL(sum(credit_amount), 0)
+			  FROM payment_credit_sale
+			  WHERE comp_id = 2056556196124250113
+				and credit_date  &gt;=  #{monstartLastMon}
+				and	credit_date	&lt;= #{monendLastMon}	)
+		UNION
+		ALL
+		SELECT '鐭冲伐娉�' dw,
+			   '灏忚'  lb,
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556196124250113
+				  and receive_date &gt;= #{monstart}
+				  and receive_date &lt;= #{monend}) + (SELECT IFNULL(sum(credit_amount), 0)
+													   FROM payment_credit_sale
+													   WHERE comp_id = 2056556196124250113
+														 and credit_date &gt;= #{monstart}
+														 and credit_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556196124250113
+				  and receive_date &gt;= #{yearstart}
+				  and receive_date &lt;= #{yearend}) + (SELECT IFNULL(sum(credit_amount), 0)
+														FROM payment_credit_sale
+														WHERE comp_id = 2056556196124250113
+														  and credit_date &gt;= #{yearstart}
+														  and credit_date &lt;= #{yearend}),
+			   (
+				   SELECT IFNULL(sum(receive_amount), 0)
+				   FROM payment_receive
+				   WHERE comp_id = 2056556196124250113
+					 and receive_date &gt;= #{monstartLastMon}
+					 and receive_date &lt;= #{monendLastMon}) + (
+				   SELECT IFNULL(sum(credit_amount), 0)
+				   FROM payment_credit_sale
+				   WHERE comp_id = 2056556196124250113
+					 and credit_date &gt;= #{monstartLastMon}
+					 and credit_date &lt;= #{monendLastMon})
+		UNION ALL
+		SELECT '閭㈠彴鍘�' dw,
+			   '搴旀敹'  lb,
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556317461270529
+				  and receive_date &gt;= #{monstart}
+				  and receive_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556317461270529
+				  and receive_date &gt;= #{yearstart}
+				  and receive_date &lt;= #{yearend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556317461270529
+				  and receive_date &gt;= #{monstartLastMon}
+				  and receive_date &lt;= #{monendLastMon})
+		UNION ALL
+		SELECT '閭㈠彴鍘�' dw,
+			   '璧婇攢'  lb,
+			   (SELECT IFNULL(sum(credit_amount), 0)
+				FROM payment_credit_sale
+				WHERE comp_id = 2056556317461270529
+				  and credit_date &gt;= #{monstart}
+				  and credit_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(credit_amount), 0)
+				FROM payment_credit_sale
+				WHERE comp_id = 2056556317461270529
+				  and credit_date &gt;= #{yearstart}
+				  and credit_date &lt;= #{yearend}),
+			(
+		SELECT IFNULL(sum (credit_amount), 0)
+		FROM payment_credit_sale
+		WHERE comp_id = 2056556317461270529
+		  and credit_date &gt;= #{monstartLastMon}
+		  and credit_date &lt;= #{monendLastMon})
+		UNION ALL
+		SELECT '閭㈠彴鍘�' dw,
+			   '灏忚'  lb,
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556317461270529
+				  and receive_date &gt;= #{monstart}
+				  and receive_date &lt;= #{monend}) + (SELECT IFNULL(sum(credit_amount), 0)
+													   FROM payment_credit_sale
+													   WHERE comp_id = 2056556317461270529
+														 and credit_date &gt;= #{monstart}
+														 and credit_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556317461270529
+				  and receive_date &gt;= #{yearstart}
+				  and receive_date &lt;= #{yearend}) + (SELECT IFNULL(sum(credit_amount), 0)
+														FROM payment_credit_sale
+														WHERE comp_id = 2056556317461270529
+														  and credit_date &gt;= #{yearstart}
+														  and credit_date &lt;= #{yearend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556317461270529
+				  and receive_date &gt;= #{monstartLastMon}
+				  and receive_date &lt;= #{monendLastMon}) + (SELECT IFNULL(sum(credit_amount), 0)
+															  FROM payment_credit_sale
+															  WHERE comp_id = 2056556317461270529
+																and credit_date &gt;= #{monstartLastMon}
+																and credit_date &lt;= #{monendLastMon})
+		UNION ALL
+		SELECT '閫氭柟鍘�' dw,
+			   '搴旀敹'  lb,
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556421857497090
+				  and receive_date &gt;= #{monstart}
+				  and receive_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556421857497090
+				  and receive_date &gt;= #{yearstart}
+				  and receive_date &lt;= #{yearend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556421857497090
+				  and receive_date &gt;= #{monstartLastMon}
+				  and receive_date &lt;= #{monendLastMon})
+		UNION ALL
+		SELECT '閫氭柟鍘�' dw,
+			   '璧婇攢'  lb,
+			   (SELECT IFNULL(sum(credit_amount), 0)
+				FROM payment_credit_sale
+				WHERE comp_id = 2056556421857497090
+				  and credit_date &gt;= #{monstart}
+				  and credit_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(credit_amount), 0)
+				FROM payment_credit_sale
+				WHERE comp_id = 2056556421857497090
+				  and credit_date &gt;= #{yearstart}
+				  and credit_date &lt;= #{yearend}),
+			(
+		SELECT IFNULL(sum (credit_amount), 0)
+		FROM payment_credit_sale
+		WHERE comp_id = 2056556421857497090
+		  and credit_date &gt;= #{monstartLastMon}
+		  and credit_date &lt;= #{monendLastMon})
+		UNION ALL
+		SELECT '閫氭柟鍘�' dw,
+			   '灏忚'  lb,
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556421857497090
+				  and receive_date &gt;= #{monstart}
+				  and receive_date &lt;= #{monend}) + (SELECT IFNULL(sum(credit_amount), 0)
+													   FROM payment_credit_sale
+													   WHERE comp_id = 2056556421857497090
+														 and credit_date &gt;= #{monstart}
+														 and credit_date &lt;= #{monend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556421857497090
+				  and receive_date &gt;= #{yearstart}
+				  and receive_date &lt;= #{yearend}) + (SELECT IFNULL(sum(credit_amount), 0)
+														FROM payment_credit_sale
+														WHERE comp_id = 2056556421857497090
+														  and credit_date &gt;= #{yearstart}
+														  and credit_date &lt;= #{yearend}),
+			   (SELECT IFNULL(sum(receive_amount), 0)
+				FROM payment_receive
+				WHERE comp_id = 2056556421857497090
+				  and receive_date &gt;= #{monstartLastMon}
+				  and receive_date &lt;= #{monendLastMon}) + (SELECT IFNULL(sum(credit_amount), 0)
+															  FROM payment_credit_sale
+															  WHERE comp_id = 2056556421857497090
+																and credit_date &gt;= #{monstartLastMon}
+																and credit_date &lt;= #{monendLastMon}) ) a
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml
index 15363dc..9da9f3a 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml
@@ -57,7 +57,7 @@
 		payment_slip ps
 		WHERE
 		ps.del_flag = '0'
-		AND comp_id = 2089995177814495234
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
 		AND ps.payment_time &gt;= CURDATE()
 		AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) smjbr,
 		(
@@ -67,7 +67,7 @@
 		payment_slip ps
 		WHERE
 		ps.del_flag = '0'
-		AND comp_id = 2089995177814495234
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
 		AND ps.payment_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
 		AND ps.payment_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
 		(
@@ -77,7 +77,7 @@
 		payment_slip ps
 		WHERE
 		ps.del_flag = '0'
-		AND comp_id = 2089995177814495234
+		  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
 		AND ps.payment_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
 		AND ps.payment_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
 		(
@@ -623,4 +623,257 @@
 		ORDER BY
 			ms.month_start ASC;
 	</select>
+	<select id="homeZbjtYearAndMon" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
+		SELECT
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND ps.payment_time &gt;= CURDATE()
+				  AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) sgbbr,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND ps.payment_time &gt;= #{startMon}
+				  AND ps.payment_time &lt; #{endMon}) sgbby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND ps.payment_time &gt;= #{startYear}
+				  AND ps.payment_time &lt; #{endYear}) sgbbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND ps.payment_time &gt;= #{startMonLastYear}
+				  AND ps.payment_time &lt; #{endMonLastYear}) sgbqnby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556196124250113
+				  AND ps.payment_time &gt;= #{startYearLastYear}
+				  AND ps.payment_time &lt; #{endYearLastYear}) sgbqnbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND ps.payment_time &gt;= CURDATE()
+				  AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) smjbr,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND ps.payment_time &gt;= #{startMon}
+				  AND ps.payment_time &lt; #{endMon}) smjby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND ps.payment_time &gt;= #{startYear}
+				  AND ps.payment_time &lt; #{endYear}) smjbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND ps.payment_time &gt;= #{startMonLastYear}
+				  AND ps.payment_time &lt; #{endMonLastYear}) smjqnby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND (comp_id = 2089995177814495234 or comp_id = 2089996921978040321 or comp_id = 2089997578009128962 or comp_id = 2101966257365045249)
+				  AND ps.payment_time &gt;= #{startYearLastYear}
+				  AND ps.payment_time &lt; #{endYearLastYear}) smjqnbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND ps.payment_time &gt;= CURDATE()
+				  AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) jxcbr,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND ps.payment_time &gt;= #{startMon}
+				  AND ps.payment_time &lt; #{endMon}) jxcby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND ps.payment_time &gt;= #{startYear}
+				  AND ps.payment_time &lt; #{endYear}) jxcbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND ps.payment_time &gt;= #{startMonLastYear}
+				  AND ps.payment_time &lt; #{endMonLastYear}) jxcqnby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556317461270529
+				  AND ps.payment_time &gt;= #{startYearLastYear}
+				  AND ps.payment_time &lt; #{endYearLastYear}) jxcqnbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND ps.payment_time &gt;= CURDATE()
+				  AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) tfbr,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND ps.payment_time &gt;= #{startMon}
+				  AND ps.payment_time &lt; #{endMon}) tfby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND ps.payment_time &gt;= #{startYear}
+				  AND ps.payment_time &lt; #{endYear}) tfbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND ps.payment_time &gt;= #{startMonLastYear}
+				  AND ps.payment_time &lt; #{endMonLastYear}) tfqnby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556421857497090
+				  AND ps.payment_time &gt;= #{startYearLastYear}
+				  AND ps.payment_time &lt; #{endYearLastYear}) tfqnbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND ps.payment_time &gt;= CURDATE()
+				  AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) ymjbr,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND ps.payment_time &gt;= #{startMon}
+				  AND ps.payment_time &lt; #{endMon}) ymjby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND ps.payment_time &gt;= #{startYear}
+				  AND ps.payment_time &lt; #{endYear}) ymjbn,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND ps.payment_time &gt;= #{startMonLastYear}
+				  AND ps.payment_time &lt; #{endMonLastYear}) ymjqnby,
+			(
+				SELECT
+					IFNULL(sum( ps.payment_amount ),0)
+				FROM
+					payment_slip ps
+				WHERE
+					ps.del_flag = '0'
+				  AND comp_id = 2056556535640576002
+				  AND ps.payment_time &gt;= #{startYearLastYear}
+				  AND ps.payment_time &lt; #{endYearLastYear}) ymjqnbn
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1