From 21dfddd6e09d32a50a636fff62a3d8a2ed362d5a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 20 八月 2026 16:29:49 +0800
Subject: [PATCH] feat：合同标的物新增导入 银行流水强制确认 简易合同新增 发票重开 合同标的物导入
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 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 7f133c5..1e9a195 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
@@ -1,16 +1,33 @@
package com.by4cloud.platformx.business.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.vo.DeptExcelVO;
+import com.by4cloud.platformx.business.dto.ContractSubjectMatterAddDTO;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.mapper.ContractSubjectMatterMapper;
+import com.by4cloud.platformx.business.mapper.ProductMapper;
import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
import com.by4cloud.platformx.business.vo.ContractSubjectMatterVo;
+import com.by4cloud.platformx.business.vo.SubjectMatterExcelVO;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.by4cloud.platformx.common.excel.vo.ErrorMessage;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.validation.BindingResult;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* 鍚堝悓鏍囩殑鐗╂槑缁嗚〃
@@ -19,7 +36,11 @@
* @date 2026-04-29 16:39:29
*/
@Service
+@RequiredArgsConstructor
public class ContractSubjectMatterServiceImpl extends ServiceImpl<ContractSubjectMatterMapper, ContractSubjectMatter> implements ContractSubjectMatterService {
+
+ private final ProductMapper productMapper;
+
@Override
public R selectSubjectMatterProcess(Long id) {
MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
@@ -29,4 +50,47 @@
List<ContractSubjectMatterVo> matterVoList = baseMapper.selectJoinList(ContractSubjectMatterVo.class,wrapper);
return R.ok(matterVoList);
}
+
+ @Override
+ public R selectSubjectMatter(Long contractId) {
+ return R.ok(baseMapper.selectListByScope(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contractId)
+ .orderByAsc(ContractSubjectMatter::getCreateTime), DataScope.of("comp_id")));
+ }
+
+ @Override
+ public R importSubjectMatter(List<SubjectMatterExcelVO> excelVOList, BindingResult bindingResult) {
+ List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
+ List<ContractSubjectMatterAddDTO> addDTOList = new ArrayList<>();
+ for (SubjectMatterExcelVO item : excelVOList) {
+ Set<String> errorMsg = new HashSet<>();
+
+ Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+ .eq(Product::getErpCode, item.getMaterialCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()));
+
+ if (one == null) {
+ errorMsg.add(item.getMaterialCode()+"erp缂栫爜涓嶅瓨鍦�");
+ }
+ if (CollUtil.isEmpty(errorMsg)) {
+ ContractSubjectMatterAddDTO addDTO = new ContractSubjectMatterAddDTO();
+ addDTO.setMaterialCode(item.getMaterialCode());
+ addDTO.setMaterialInternalName(one.getProductName());
+ addDTO.setMaterialName(item.getMaterialName());
+ addDTO.setUnitPrice(item.getUnitPrice());
+ addDTO.setQuantity(item.getQuantity());
+ addDTO.setSpecification(one.getProductType());
+ addDTOList.add(addDTO);
+ }
+ else {
+ // 鏁版嵁涓嶅悎娉曟儏鍐�
+ errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+ }
+ }
+ if (CollUtil.isNotEmpty(errorMessageList)) {
+ return R.failed(errorMessageList,"閮ㄩ棬瀵煎叆澶辫触");
+ }
+ return R.ok(addDTOList, "閮ㄩ棬瀵煎叆鎴愬姛");
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1