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-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

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()

--
Gitblit v1.9.1