From c5ea85558fea4d82b5368073c598a30f905c4bdc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 23 十月 2026 17:11:49 +0800
Subject: [PATCH] feat:新增统计标注功能

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 1 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
index a6f7d64..0221b3f 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
@@ -18,6 +18,7 @@
 import com.by4cloud.platformx.business.dto.BankStatementUpdateDTO;
 import com.by4cloud.platformx.business.dto.BipQueryDTO;
 import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
+import com.by4cloud.platformx.business.dto.SyncPaymentRecepitDTO;
 import com.by4cloud.platformx.business.entity.*;
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.BankStatementService;
@@ -76,6 +77,27 @@
 
 	@Value("${erp.sgb}")
 	private String sgbErp;
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
+	@Value("${dept.jxc}")
+	private String jxc;
+
+	@Value("${dept.tfgs}")
+	private String tfgs;
+
+	@Value("${dept.ymj}")
+	private String ymj;
 
 	@Override
 	public R edit(BankStatementUpdateDTO updateDTO) {
@@ -289,11 +311,15 @@
 		item.put("expenseItemCode", bipVo.getItemList().get(0).getJjsx());//缁忔祹浜嬮」
 		item.put("remarks", bipVo.getItemList().get(0).getZy());//鎽樿
 		JSONObject freeChId = new JSONObject();
-		freeChId.put("GX08", bipVo.getItemList().get(0).getHsdy());//鏍哥畻鍗曞厓
+
 		freeChId.put("YSYF14", "1");//娆鹃」绫诲瀷 1 棰勬敹娆� 2 搴旀敹娆�
+		freeChId.put("YSYF33", bipVo.getItemList().get(0).getFphm());//鍙戠エ鍙风爜
+		freeChId.put("GX08", bipVo.getItemList().get(0).getHsdy());//鏍哥畻鍗曞厓
 		freeChId.put("JT04", bipVo.getItemList().get(0).getHsjylx());//鏍哥畻浜ゆ槗绫诲瀷 0101 闆嗗洟澶栭儴 01020301 涓夌骇鍒嗗瓙鍏徃闂� 01020302 涓夌骇鍒嗗叕鍙镐笌瀛愬瓙鍏徃涔嬮棿
 		freeChId.put("JT06", bipVo.getItemList().get(0).getKxmx());//娆鹃」鏄庣粏
 		freeChId.put("JT12", bipVo.getItemList().get(0).getCpwlfl());//浜у搧鐗╂枡鍒嗙被
+		freeChId.put("JT32", bipVo.getItemList().get(0).getZyys());//浣滀笟瑕佺礌
+		freeChId.put("zzbkfl", bipVo.getItemList().get(0).getBkfl());//鏉垮潡鍒嗙被
 
 		item.put("freeChId", freeChId);
 
@@ -302,6 +328,7 @@
 		data.put("bodyItem", bodyItem);
 		JSONObject datafreeChId = new JSONObject();
 		datafreeChId.put("YSYF_SFZY", bipVo.getSfzy());//鏄惁涓昏惀
+		datafreeChId.put("fk_035", bipVo.getSffz());//鏄惁鍏ヨ礋鍊虹鐩�
 		datafreeChId.put("fk_038", bipVo.getPzzdr());//鍑瘉鍒跺崟浜�
 		datafreeChId.put("YSYF_08", bipVo.getSfnbwl());//鏄惁鍐呴儴寰�鏉�
 		datafreeChId.put("YSYF24", bipVo.getSfjyjs());//鏄惁绠�鏄撹绋�
@@ -634,6 +661,7 @@
 		bipVo.setDjfx("1");
 		List<ReceiveItemVo> list = new ArrayList<>();
 		ReceiveItemVo itemVo = new ReceiveItemVo();
+		itemVo.setKxlx("1");
 		itemVo.setConfirmAmount(bankStatementItem.getConfirmAmount());
 		list.add(itemVo);
 		bipVo.setItemList(list);
@@ -661,4 +689,34 @@
 
 		return pushSaveCollection(statement, item);
 	}
+
+	@Override
+	public R pullBankData(SyncPaymentRecepitDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getStartDate())||StrUtil.isBlank(queryDTO.getEndDate())){
+			return R.failed("璇烽�夋嫨浜ゆ槗鏃堕棿鑼冨洿");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			queryDTO.setBipCode("10860");
+		}
+		if ( StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ) {
+			queryDTO.setBipCode("1086005");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+			queryDTO.setBipCode("10860");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			queryDTO.setBipCode("10802 ");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			queryDTO.setBipCode("10668");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			queryDTO.setBipCode("10861");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			queryDTO.setBipCode("10801");
+		}
+		return paymentConfirmService.syncPaymentRecepit(queryDTO);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1