songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

refactor(service): 实现VoableService接口以统一VO与实体映射逻辑

Browse Source 
refactor(model): 重构实体类与VO类的字段映射关系
style: 调整代码格式与注释
fix: 修复部分字段映射错误
This commit is contained in:
宋其青
2025-09-26 12:31:08 +08:00
parent 045a1e9eed
commit 42a8f9ab30
67 changed files with 2277 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/src/main/java/com/ecep/contract/ds/company/service/CompanyBankAccountService.java
View File

@@ -18,16 +18,22 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.repository.CompanyBankAccountRepository;
import com.ecep.contract.ds.other.service.BankService;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.CompanyBankAccountVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "company-bank-account")
public class CompanyBankAccountService implements IEntityService<CompanyBankAccount>, QueryService<CompanyBankAccount> {
public class CompanyBankAccountService implements IEntityService<CompanyBankAccount>, QueryService<CompanyBankAccount>,
VoableService<CompanyBankAccount, CompanyBankAccountVo> {
private static final Logger logger = LoggerFactory.getLogger(CompanyBankAccountService.class);
@Lazy
@Autowired
@@ -126,4 +132,35 @@ public class CompanyBankAccountService implements IEntityService<CompanyBankAcco
spec = SpecificationUtils.andParam(spec, paramsNode, "company");
return findAll(spec, pageable);
}
@Override
public void updateByVo(CompanyBankAccount model, CompanyBankAccountVo vo) {
if (model == null) {
throw new ServiceException("CompanyBankAccount cannot be null");
}
if (vo == null) {
throw new ServiceException("CompanyBankAccountVo cannot be null");
}
// 基本属性映射
model.setAccount(vo.getAccount());
model.setOpeningBank(vo.getOpeningBank());
model.setDescription(vo.getDescription());
// 处理关联关系 - 公司
if (vo.getCompanyId() != null) {
model.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
} else {
model.setCompany(null);
}
// 处理关联关系 - 银行
if (vo.getBankId() != null) {
model.setBank(SpringApp.getBean(BankService.class).findById(vo.getBankId()));
} else {
model.setBank(null);
}
// 注意：CompanyBankAccount实体类中没有active字段，所以不需要设置
}
}

40
server/src/main/java/com/ecep/contract/ds/company/service/CompanyContactService.java
View File

@@ -16,11 +16,16 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.repository.CompanyContactRepository;
import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyContact;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.MyStringUtils;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.CompanyContactVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -29,7 +34,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "company-contact")
public class CompanyContactService implements IEntityService<CompanyContact>, QueryService<CompanyContact> {
public class CompanyContactService implements IEntityService<CompanyContact>, QueryService<CompanyContact>,
VoableService<CompanyContact, CompanyContactVo> {
private static final Logger logger = LoggerFactory.getLogger(CompanyContactService.class);
@Autowired
@@ -118,4 +124,36 @@ public class CompanyContactService implements IEntityService<CompanyContact>, Qu
spec = SpecificationUtils.andParam(spec, paramsNode, "company");
return findAll(spec, pageable);
}
@Override
public void updateByVo(CompanyContact model, CompanyContactVo vo) {
if (model == null) {
throw new ServiceException("CompanyContact cannot be null");
}
if (vo == null) {
throw new ServiceException("CompanyContactVo cannot be null");
}
// 基本属性映射
model.setName(vo.getName());
model.setPhone(vo.getPhone());
model.setEmail(vo.getEmail());
model.setAddress(vo.getAddress());
model.setPosition(vo.getPosition());
model.setU8Code(vo.getU8Code());
model.setMemo(vo.getMemo());
model.setCreated(vo.getCreated());
// 处理关联关系 - 公司
if (vo.getCompanyId() != null) {
model.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
} else {
model.setCompany(null);
}
// 注意：
// 1. CompanyContact实体类中没有primary字段，所以不需要设置
// 2. CompanyContact实体类中没有active字段，所以不需要设置
}
}

109
server/src/main/java/com/ecep/contract/ds/company/service/CompanyFileService.java
View File

@@ -11,10 +11,6 @@ import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.ecep.contract.*;
import com.ecep.contract.constant.CompanyConstant;
import com.ecep.contract.ds.MyRepository;
import com.ecep.contract.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,22 +21,29 @@ import org.springframework.cache.annotation.Caching;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ecep.contract.CompanyFileType;
import com.ecep.contract.IEntityService;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.constant.CloudServiceConstant;
import com.ecep.contract.constant.CompanyConstant;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.company.repository.CompanyFileRepository;
import com.ecep.contract.ds.company.repository.CompanyFileTypeLocalRepository;
import com.ecep.contract.ds.company.repository.CompanyOldNameRepository;
import com.ecep.contract.ds.contract.service.ContractService;
import com.ecep.contract.ds.vendor.repository.VendorGroupRepository;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyFile;
import com.ecep.contract.model.CompanyFileTypeLocal;
import com.ecep.contract.model.CompanyOldName;
import com.ecep.contract.model.Contract;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.FileUtils;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.CompanyFileVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -49,26 +52,17 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "company-file")
public class CompanyFileService extends EntityService<CompanyFile, Integer> implements IEntityService<CompanyFile>, QueryService<CompanyFile> {
public class CompanyFileService
implements IEntityService<CompanyFile>, QueryService<CompanyFile>, VoableService<CompanyFile, CompanyFileVo> {
private final VendorGroupRepository vendorGroupRepository;
private static final Logger logger = LoggerFactory.getLogger(CompanyFileService.class);
@Lazy
@Autowired
private CompanyFileRepository companyFileRepository;
@Lazy
@Autowired
private CompanyOldNameRepository companyOldNameRepository;
@Lazy
@Autowired
private CompanyFileTypeLocalRepository fileTypeLocalRepository;
@Override
protected CompanyFileRepository getRepository() {
return companyFileRepository;
}
@Override
public CompanyFile createNewEntity() {
return new CompanyFile();
CompanyFileService(VendorGroupRepository vendorGroupRepository) {
this.vendorGroupRepository = vendorGroupRepository;
}
@Cacheable(key = "#p0")
@@ -76,20 +70,10 @@ public class CompanyFileService extends EntityService<CompanyFile, Integer> impl
return companyFileRepository.findById(id).orElse(null);
}
public List<CompanyFile> findFileByCompanyAndType(Company company, CompanyFileType type) {
return companyFileRepository.findByCompanyAndType(company, type);
}
@Override
protected Specification<CompanyFile> buildSearchSpecification(String searchText) {
return (root, query, builder) -> {
return builder.or(builder.like(root.get("filePath"), "%" + searchText + "%"));
};
}
@Override
protected Specification<CompanyFile> buildParameterSpecification(JsonNode paramsNode) {
Specification<CompanyFile> spec = null;
if (paramsNode.has("type")) {
@@ -280,7 +264,7 @@ public class CompanyFileService extends EntityService<CompanyFile, Integer> impl
}
// 获取所有曾用名
for (CompanyOldName companyOldName : companyOldNameRepository.findAllByCompanyId(company.getId())) {
for (CompanyOldName companyOldName : SpringApp.getBean(CompanyOldNameService.class).findAllByCompany(company)) {
String path = companyOldName.getPath();
if (StringUtils.hasText(path)) {
File dir = new File(path);
@@ -439,5 +423,62 @@ public class CompanyFileService extends EntityService<CompanyFile, Integer> impl
}
@Override
public Page<CompanyFile> findAll(JsonNode paramsNode, Pageable pageable) {
Specification<CompanyFile> spec = null;
if (paramsNode.has(ServiceConstant.KEY_SEARCH_TEXT)) {
spec = getSpecification(paramsNode.get(ServiceConstant.KEY_SEARCH_TEXT).asText());
}
spec = SpecificationUtils.and(spec, buildParameterSpecification(paramsNode));
return findAll(spec, pageable);
}
@Override
public Page<CompanyFile> findAll(Specification<CompanyFile> spec, Pageable pageable) {
return companyFileRepository.findAll(spec, pageable);
}
@Override
public Specification<CompanyFile> getSpecification(String searchText) {
if (!StringUtils.hasText(searchText)) {
return null;
}
return SpecificationUtils.andWith(searchText, this::buildSearchSpecification);
}
protected Specification<CompanyFile> buildSearchSpecification(String searchText) {
return (root, query, builder) -> {
return builder.or(builder.like(root.get("filePath"), "%" + searchText + "%"));
};
}
@Override
public void updateByVo(CompanyFile model, CompanyFileVo vo) {
// 空值校验
if (model == null) {
throw new IllegalArgumentException("companyFile cannot be null");
}
if (vo == null) {
throw new IllegalArgumentException("companyFileVo cannot be null");
}
// 映射基本属性
model.setId(vo.getId());
model.setType(vo.getType());
model.setApplyDate(vo.getApplyDate());
model.setExpiringDate(vo.getExpiringDate());
model.setFilePath(vo.getFilePath());
// 处理公司关联
if (vo.getCompanyId() == null) {
model.setCompany(null);
} else {
CompanyService companyService = SpringApp.getBean(CompanyService.class);
Company company = companyService.findById(vo.getCompanyId());
model.setCompany(company);
}
// 实体类中没有active字段，不需要映射
}
}

16
server/src/main/java/com/ecep/contract/ds/company/service/InvoiceService.java
View File

@@ -18,15 +18,21 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.repository.InvoiceRepository;
import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.model.Invoice;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.InvoiceVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "invoice")
public class InvoiceService implements IEntityService<Invoice>, QueryService<Invoice> {
public class InvoiceService implements IEntityService<Invoice>, QueryService<Invoice>,
VoableService<Invoice, InvoiceVo> {
private static final Logger logger = LoggerFactory.getLogger(InvoiceService.class);
@Autowired
@@ -80,9 +86,15 @@ public class InvoiceService implements IEntityService<Invoice>, QueryService<Inv
if (paramsNode.has("searchText")) {
spec = getSpecification(paramsNode.get("searchText").asText());
}
// field
spec = SpecificationUtils.andParam(spec, paramsNode, "company");
return findAll(spec, pageable);
}
@Override
public void updateByVo(Invoice model, InvoiceVo vo) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'updateByVo'");
}
}

30
server/src/main/java/com/ecep/contract/ds/contract/service/ContractBidVendorService.java
View File

@@ -17,17 +17,22 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.ds.contract.repository.ContractBidVendorRepository;
import com.ecep.contract.ds.contract.repository.ContractFileRepository;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractBidVendor;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ContractBidVendorVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-ven-bid")
public class ContractBidVendorService implements IEntityService<ContractBidVendor>, QueryService<ContractBidVendor> {
public class ContractBidVendorService implements IEntityService<ContractBidVendor>, QueryService<ContractBidVendor>, VoableService<ContractBidVendor, ContractBidVendorVo> {
@Lazy
@Autowired
private ContractBidVendorRepository repository;
@@ -99,9 +104,30 @@ public class ContractBidVendorService implements IEntityService<ContractBidVendo
if (paramsNode.has("searchText")) {
spec = getSpecification(paramsNode.get("searchText").asText());
}
// field
spec = SpecificationUtils.andParam(spec, paramsNode, "contract", "company");
return findAll(spec, pageable);
}
@Override
public void updateByVo(ContractBidVendor model, ContractBidVendorVo vo) {
// 处理关联对象
if (vo.getContractId() == null) {
model.setContract(null);
} else {
model.setContract(SpringApp.getBean(ContractService.class).findById(vo.getContractId()));
}
if (vo.getCompanyId() == null) {
model.setCompany(null);
} else {
model.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
}
if (vo.getQuotationSheetFileId() == null) {
model.setQuotationSheet(null);
} else {
model.setQuotationSheet(SpringApp.getBean(ContractFileRepository.class).findById(vo.getQuotationSheetFileId()).orElse(null));
}
}
}

17
server/src/main/java/com/ecep/contract/ds/contract/service/ContractCatalogService.java
View File

@@ -18,6 +18,8 @@ import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.contract.repository.ContractCatalogRepository;
import com.ecep.contract.model.ContractCatalog;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.ContractCatalogVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -26,7 +28,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-catalog")
public class ContractCatalogService implements IEntityService<ContractCatalog>, QueryService<ContractCatalog> {
public class ContractCatalogService implements IEntityService<ContractCatalog>, QueryService<ContractCatalog>,
VoableService<ContractCatalog, ContractCatalogVo> {
@Lazy
@Autowired
private ContractCatalogRepository repository;
@@ -99,4 +102,16 @@ public class ContractCatalogService implements IEntityService<ContractCatalog>,
}
return findAll(spec, pageable);
}
@Override
public void updateByVo(ContractCatalog model, ContractCatalogVo vo) {
if (model == null || vo == null) {
return;
}
model.setCode(vo.getCode());
model.setName(vo.getName());
model.setPath(vo.getPath());
model.setParent(vo.getParent());
model.setUseYear(vo.isUseYear());
}
}

21
server/src/main/java/com/ecep/contract/ds/contract/service/ContractFileService.java
View File

@@ -21,16 +21,20 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.ContractFileType;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.ContractFileRepository;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractFile;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ContractFileVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-file")
public class ContractFileService implements IEntityService<ContractFile>, QueryService<ContractFile> {
public class ContractFileService implements IEntityService<ContractFile>, QueryService<ContractFile>,
VoableService<ContractFile, ContractFileVo> {
private static final Logger logger = LoggerFactory.getLogger(ContractFileService.class);
@Lazy
@Autowired
@@ -166,4 +170,19 @@ public class ContractFileService implements IEntityService<ContractFile>, QueryS
};
return contractFileRepository.findAll(spec);
}
@Override
public void updateByVo(ContractFile model, ContractFileVo vo) {
// 更新基本属性
if (vo.getContractId() == null) {
model.setContract(null);
} else {
model.setContract(SpringApp.getBean(ContractService.class).findById(vo.getContractId()));
}
model.setType(vo.getType());
model.setFileName(vo.getFileName());
model.setApplyDate(vo.getApplyDate());
model.setDescription(vo.getDescription());
}
}

27
server/src/main/java/com/ecep/contract/ds/contract/service/ContractFileTypeService.java
View File

@@ -3,7 +3,6 @@ package com.ecep.contract.ds.contract.service;
import java.util.Locale;
import java.util.Map;
import com.ecep.contract.VendorType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -22,14 +21,18 @@ import com.ecep.contract.QueryService;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.contract.repository.ContractFileTypeLocalRepository;
import com.ecep.contract.model.ContractFileTypeLocal;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ContractFileTypeLocalVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-file-type")
public class ContractFileTypeService
implements IEntityService<ContractFileTypeLocal>, QueryService<ContractFileTypeLocal> {
implements IEntityService<ContractFileTypeLocal>, QueryService<ContractFileTypeLocal>,
VoableService<ContractFileTypeLocal, ContractFileTypeLocalVo> {
@Lazy
@Autowired
private ContractFileTypeLocalRepository repository;
@@ -42,7 +45,8 @@ public class ContractFileTypeService
}
if (paramsNode.has("type")) {
spec = SpecificationUtils.and(spec, (root, query, builder) -> builder.equal(root.get("type"), ContractFileType.valueOf(paramsNode.get("type").asText())));
spec = SpecificationUtils.and(spec, (root, query, builder) -> builder.equal(root.get("type"),
ContractFileType.valueOf(paramsNode.get("type").asText())));
}
// field
@@ -96,4 +100,21 @@ public class ContractFileTypeService
return repository.save(entity);
}
@Override
public void updateByVo(ContractFileTypeLocal model, ContractFileTypeLocalVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
model.setId(vo.getId());
model.setLang(vo.getLang());
model.setType(vo.getType());
model.setValue(vo.getValue());
model.setDescription(vo.getDescription());
model.setSuggestFileName(vo.getSuggestFileName());
}
}

15
server/src/main/java/com/ecep/contract/ds/contract/service/ContractGroupService.java
View File

@@ -19,6 +19,8 @@ import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.contract.repository.ContractGroupRepository;
import com.ecep.contract.model.ContractGroup;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.ContractGroupVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -27,7 +29,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-group")
public class ContractGroupService implements IEntityService<ContractGroup>, QueryService<ContractGroup> {
public class ContractGroupService implements IEntityService<ContractGroup>, QueryService<ContractGroup>,
VoableService<ContractGroup, ContractGroupVo> {
private static final Logger logger = LoggerFactory.getLogger(ContractGroupService.class);
@Lazy
@@ -113,4 +116,14 @@ public class ContractGroupService implements IEntityService<ContractGroup>, Quer
return group;
}
@Override
public void updateByVo(ContractGroup model, ContractGroupVo vo) {
if (model != null && vo != null) {
model.setId(vo.getId());
model.setName(vo.getName());
model.setCode(vo.getCode());
model.setTitle(vo.getTitle());
}
}
}

53
server/src/main/java/com/ecep/contract/ds/contract/service/ContractItemService.java
View File

@@ -19,11 +19,17 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.ContractItemRepository;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.other.service.InventoryService;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractItem;
import com.ecep.contract.model.Inventory;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ContractItemVo;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.persistence.criteria.Path;
@@ -31,7 +37,7 @@ import jakarta.persistence.criteria.Path;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-item")
public class ContractItemService implements IEntityService<ContractItem>, QueryService<ContractItem> {
public class ContractItemService implements IEntityService<ContractItem>, QueryService<ContractItem>, VoableService<ContractItem, ContractItemVo> {
private static final Logger logger = LoggerFactory.getLogger(ContractItemService.class);
@Lazy
@@ -98,6 +104,51 @@ public class ContractItemService implements IEntityService<ContractItem>, QueryS
@Caching(evict = {
@CacheEvict(key = "#p0.id")
})
@Override
public void updateByVo(ContractItem model, ContractItemVo vo) {
// 更新基本属性
model.setRefId(vo.getRefId());
model.setItemCode(vo.getItemCode());
model.setTitle(vo.getTitle());
model.setSpecification(vo.getSpecification());
model.setUnit(vo.getUnit());
model.setExclusiveTaxPrice(vo.getExclusiveTaxPrice() != null ? vo.getExclusiveTaxPrice() : 0);
model.setTaxRate(vo.getTaxRate() != null ? vo.getTaxRate() : 0);
model.setTaxPrice(vo.getTaxPrice() != null ? vo.getTaxPrice() : 0);
model.setQuantity(vo.getQuantity() != null ? vo.getQuantity() : 0);
model.setStartDate(vo.getStartDate());
model.setEndDate(vo.getEndDate());
model.setRemark(vo.getRemark());
// 处理关联对象
if (vo.getContractId() == null) {
model.setContract(null);
} else {
model.setContract(SpringApp.getBean(ContractService.class).findById(vo.getContractId()));
}
if (vo.getInventoryId() == null) {
model.setInventory(null);
} else {
model.setInventory(SpringApp.getBean(InventoryService.class).findById(vo.getInventoryId()));
}
if (vo.getCreatorId() == null) {
model.setCreator(null);
} else {
model.setCreator(SpringApp.getBean(EmployeeService.class).findById(vo.getCreatorId()));
}
if (vo.getUpdaterId() == null) {
model.setUpdater(null);
} else {
model.setUpdater(SpringApp.getBean(EmployeeService.class).findById(vo.getUpdaterId()));
}
// 创建日期和更新日期通常由系统自动维护，这里不设置
}
public ContractItem save(ContractItem item) {
return itemRepository.save(item);
}

16
server/src/main/java/com/ecep/contract/ds/contract/service/ContractKindService.java
View File

@@ -19,6 +19,8 @@ import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.contract.repository.ContractKindRepository;
import com.ecep.contract.model.ContractKind;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.ContractKindVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -27,7 +29,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-kind")
public class ContractKindService implements IEntityService<ContractKind>, QueryService<ContractKind> {
public class ContractKindService implements IEntityService<ContractKind>, QueryService<ContractKind>,
VoableService<ContractKind, ContractKindVo> {
private static final Logger logger = LoggerFactory.getLogger(ContractKindService.class);
@Lazy
@@ -99,4 +102,15 @@ public class ContractKindService implements IEntityService<ContractKind>, QueryS
public void delete(Integer id) {
repository.deleteById(id);
}
@Override
public void updateByVo(ContractKind model, ContractKindVo vo) {
if (model == null || vo == null) {
return;
}
model.setName(vo.getName());
model.setCode(vo.getCode());
model.setTitle(vo.getTitle());
// model.setActive(vo.isActive());
}
}

28
server/src/main/java/com/ecep/contract/ds/contract/service/ContractPayPlanService.java
View File

@@ -16,10 +16,13 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.ContractPayPlanRepository;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractPayPlan;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ContractPayPlanVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -28,7 +31,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-pay-plan")
public class ContractPayPlanService implements IEntityService<ContractPayPlan>, QueryService<ContractPayPlan> {
public class ContractPayPlanService implements IEntityService<ContractPayPlan>, QueryService<ContractPayPlan>,
VoableService<ContractPayPlan, ContractPayPlanVo> {
@Lazy
@Autowired
private ContractPayPlanRepository repository;
@@ -85,4 +89,26 @@ public class ContractPayPlanService implements IEntityService<ContractPayPlan>,
return repository.save(entity);
}
@Override
public void updateByVo(ContractPayPlan model, ContractPayPlanVo vo) {
if (model == null || vo == null) {
return;
}
model.setRefId(vo.getRefId());
model.setPayRatio(vo.getPayRatio());
model.setPayCurrency(vo.getPayCurrency() != null ? vo.getPayCurrency() : 0);
model.setPayDate(vo.getPayDate());
model.setPayTerm(vo.getPayTerm());
// 处理关联对象
if (vo.getContractId() == null) {
model.setContract(null);
} else {
model.setContract(SpringApp.getBean(ContractService.class).findById(vo.getContractId()));
}
if (vo.getUpdateDate() != null) {
model.setUpdateDate(vo.getUpdateDate());
}
}
}

80
server/src/main/java/com/ecep/contract/ds/contract/service/ContractService.java
View File

@@ -373,24 +373,86 @@ public class ContractService extends EntityService<Contract, Integer>
@Override
public void updateByVo(Contract contract, ContractVo vo) {
if (contract == null || vo == null) {
return;
}
contract.setCode(vo.getCode());
contract.setName(vo.getName());
contract.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
contract.setGroup(SpringApp.getBean(ContractGroupService.class).findById(vo.getGroupId()));
contract.setType(SpringApp.getBean(ContractTypeService.class).findById(vo.getTypeId()));
contract.setKind(SpringApp.getBean(ContractKindService.class).findById(vo.getKindId()));
contract.setProject(SpringApp.getBean(ProjectService.class).findById(vo.getProject()));
contract.setGuid(vo.getGuid());
contract.setState(vo.getState());
contract.setPath(vo.getPath());
contract.setDescription(vo.getDescription());
contract.setAmount(vo.getAmount());
contract.setStandardPayWay(vo.isStandardPayWay());
contract.setStandardPContractText(vo.isStandardPContractText());
contract.setTotalQuantity(vo.getTotalQuantity());
contract.setTotalAmount(vo.getTotalAmount());
contract.setTotalUnTaxAmount(vo.getTotalUnTaxAmount());
contract.setExecQuantity(vo.getExecQuantity());
contract.setExecAmount(vo.getExecAmount());
contract.setExecUnTaxAmount(vo.getExecUnTaxAmount());
contract.setPayWay(vo.getPayWay());
if (vo.getCompanyId() == null) {
contract.setCompany(null);
} else {
contract.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
}
if (vo.getGroupId() == null) {
contract.setGroup(null);
} else {
contract.setGroup(SpringApp.getBean(ContractGroupService.class).findById(vo.getGroupId()));
}
if (vo.getTypeId() == null) {
contract.setType(null);
} else {
contract.setType(SpringApp.getBean(ContractTypeService.class).findById(vo.getTypeId()));
}
if (vo.getKindId() == null) {
contract.setKind(null);
} else {
contract.setKind(SpringApp.getBean(ContractKindService.class).findById(vo.getKindId()));
}
if (vo.getProject() == null) {
contract.setProject(null);
} else {
contract.setProject(SpringApp.getBean(ProjectService.class).findById(vo.getProject()));
}
contract.setParentCode(vo.getParentCode());
contract.setOrderDate(vo.getOrderDate());
contract.setStartDate(vo.getStartDate());
contract.setEndDate(vo.getEndDate());
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
contract.setEmployee(employeeService.findById(vo.getEmployeeId()));
contract.setHandler(employeeService.findById(vo.getHandlerId()));
contract.setSetupPerson(employeeService.findById(vo.getSetupPersonId()));
if (vo.getEmployeeId() == null) {
contract.setEmployee(null);
} else {
contract.setEmployee(employeeService.findById(vo.getEmployeeId()));
}
if (vo.getHandlerId() == null) {
contract.setHandler(null);
} else {
contract.setHandler(employeeService.findById(vo.getHandlerId()));
}
if (vo.getSetupPersonId() == null) {
contract.setSetupPerson(null);
} else {
contract.setSetupPerson(employeeService.findById(vo.getSetupPersonId()));
}
contract.setSetupDate(vo.getSetupDate());
contract.setInurePerson(employeeService.findById(vo.getInurePersonId()));
if (vo.getInurePersonId() == null) {
contract.setInurePerson(null);
} else {
contract.setInurePerson(employeeService.findById(vo.getInurePersonId()));
}
contract.setInureDate(vo.getInureDate());
if (vo.getVaryPersonId() == null) {
contract.setVaryPerson(null);
} else {
contract.setVaryPerson(employeeService.findById(vo.getVaryPersonId()));
}
contract.setVaryDate(vo.getVaryDate());
}
}

21
server/src/main/java/com/ecep/contract/ds/contract/service/ContractTypeService.java
View File

@@ -19,6 +19,8 @@ import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.contract.repository.ContractTypeRepository;
import com.ecep.contract.model.ContractType;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.ContractTypeVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -27,7 +29,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-type")
public class ContractTypeService implements IEntityService<ContractType>, QueryService<ContractType> {
public class ContractTypeService implements IEntityService<ContractType>, QueryService<ContractType>,
VoableService<ContractType, ContractTypeVo> {
private static final Logger logger = LoggerFactory.getLogger(ContractTypeService.class);
@Lazy
@@ -98,7 +101,21 @@ public class ContractTypeService implements IEntityService<ContractType>, QueryS
return (root, query, builder) -> {
return builder.or(
builder.like(root.get("code"), "%" + searchText + "%"),
builder.like(root.get("name"), "%" + searchText + "%"));
builder.like(root.get("name"), "%" + searchText + "%"),
builder.like(root.get("title"), "%" + searchText + "%"));
};
}
@Override
public void updateByVo(ContractType model, ContractTypeVo vo) {
// 更新基本属性
model.setName(vo.getName());
model.setCode(vo.getCode());
model.setCatalog(vo.getCatalog());
model.setTitle(vo.getTitle());
model.setDirection(vo.getDirection());
// 注意：ContractType实体类中没有active字段，所以不设置
}
}

52
server/src/main/java/com/ecep/contract/ds/contract/service/ExtendVendorInfoService.java
View File

@@ -23,19 +23,25 @@ import com.ecep.contract.ds.contract.repository.ExtendVendorInfoRepository;
import com.ecep.contract.ds.vendor.service.VendorGroupService;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ExtendVendorInfo;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ExtendVendorInfoVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-ext-ven-info")
public class ExtendVendorInfoService implements IEntityService<ExtendVendorInfo>, QueryService<ExtendVendorInfo> {
public class ExtendVendorInfoService implements IEntityService<ExtendVendorInfo>, QueryService<ExtendVendorInfo>,
VoableService<ExtendVendorInfo, ExtendVendorInfoVo> {
@Lazy
@Autowired
private ExtendVendorInfoRepository repository;
@Lazy
@Autowired
private VendorGroupService vendorGroupService;
@Lazy
@Autowired
private ContractService contractService;
@Override
@Cacheable(key = "#p0")
@@ -56,22 +62,20 @@ public class ExtendVendorInfoService implements IEntityService<ExtendVendorInfo>
return repository.save(bidVendor);
}
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'bycontract-'+#p0.contract.id")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'bycontract-'+#p0.contract.id")
})
@Override
public void delete(ExtendVendorInfo bidVendor) {
repository.delete(bidVendor);
}
@Override
public Page<ExtendVendorInfo> findAll(Specification<ExtendVendorInfo> spec, Pageable pageable) {
return repository.findAll(spec, pageable);
}
@Override
public Specification<ExtendVendorInfo> getSpecification(String searchText) {
if (!StringUtils.hasText(searchText)) {
@@ -81,11 +85,10 @@ public class ExtendVendorInfoService implements IEntityService<ExtendVendorInfo>
return builder.or(
builder.like(root.get("contract").get("code"), "%" + searchText + "%"),
builder.like(root.get("contract").get("name"), "%" + searchText + "%"),
builder.like(root.get("codeSequenceNumber").as(String.class), "%" + searchText + "%")
);
builder.like(root.get("codeSequenceNumber").as(String.class), "%" + searchText + "%"));
};
}
@Override
public Page<ExtendVendorInfo> findAll(JsonNode paramsNode, Pageable pageable) {
Specification<ExtendVendorInfo> spec = null;
@@ -122,4 +125,29 @@ public class ExtendVendorInfoService implements IEntityService<ExtendVendorInfo>
info.setPrePurchase(false);
return info;
}
@Override
public void updateByVo(ExtendVendorInfo entity, ExtendVendorInfoVo vo) {
if (entity == null || vo == null) {
return;
}
// 更新基本属性
entity.setCodeSequenceNumber(vo.getCodeSequenceNumber());
entity.setAssignedProvider(vo.isAssignedProvider());
entity.setPrePurchase(vo.isPrePurchase());
// 处理关联对象
if (vo.getContractId() != null) {
entity.setContract(contractService.findById(vo.getContractId()));
} else {
entity.setContract(null);
}
if (vo.getGroupId() != null) {
entity.setGroup(vendorGroupService.findById(vo.getGroupId()));
} else {
entity.setGroup(null);
}
}
}

55
server/src/main/java/com/ecep/contract/ds/contract/service/PurchaseBillVoucherService.java
View File

@@ -19,9 +19,15 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.ds.company.service.InvoiceService;
import com.ecep.contract.ds.contract.repository.PurchaseBillVoucherRepository;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.model.PurchaseBillVoucher;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.PurchaseBillVoucherVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -31,7 +37,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Service
@CacheConfig(cacheNames = "purchase-bill-voucher")
public class PurchaseBillVoucherService
implements IEntityService<PurchaseBillVoucher>, QueryService<PurchaseBillVoucher> {
implements IEntityService<PurchaseBillVoucher>, QueryService<PurchaseBillVoucher>,
VoableService<PurchaseBillVoucher, PurchaseBillVoucherVo> {
private static final Logger logger = LoggerFactory.getLogger(PurchaseBillVoucherService.class);
@Lazy
@@ -124,4 +131,50 @@ public class PurchaseBillVoucherService
public List<PurchaseBillVoucher> search(String searchText) {
return repository.findAll(getSpecification(searchText), Pageable.ofSize(10)).getContent();
}
@Override
public void updateByVo(PurchaseBillVoucher model, PurchaseBillVoucherVo vo) {
if (model == null || vo == null) {
return;
}
model.setRefId(vo.getRefId());
model.setCode(vo.getCode());
model.setMakerDate(vo.getMakerDate());
model.setModifyDate(vo.getModifyDate());
model.setVerifierDate(vo.getVerifierDate());
model.setDescription(vo.getDescription());
// 处理关联对象
if (vo.getInvoiceId() == null) {
model.setInvoice(null);
} else {
model.setInvoice(SpringApp.getBean(InvoiceService.class).findById(vo.getInvoiceId()));
}
if (vo.getCompanyId() == null) {
model.setCompany(null);
} else {
model.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getEmployeeId() == null) {
model.setEmployee(null);
} else {
model.setEmployee(employeeService.findById(vo.getEmployeeId()));
}
if (vo.getMakerId() == null) {
model.setMaker(null);
} else {
model.setMaker(employeeService.findById(vo.getMakerId()));
}
if (vo.getVerifierId() == null) {
model.setVerifier(null);
} else {
model.setVerifier(employeeService.findById(vo.getVerifierId()));
}
}
}

38
server/src/main/java/com/ecep/contract/ds/contract/service/PurchaseOrderItemService.java
View File

@@ -19,15 +19,21 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.PurchaseOrderItemRepository;
import com.ecep.contract.ds.other.service.InventoryService;
import com.ecep.contract.model.PurchaseOrderItem;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.PurchaseOrderItemVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-purchase-order-item")
public class PurchaseOrderItemService implements IEntityService<PurchaseOrderItem>, QueryService<PurchaseOrderItem> {
public class PurchaseOrderItemService implements IEntityService<PurchaseOrderItem>, QueryService<PurchaseOrderItem>,
VoableService<PurchaseOrderItem, PurchaseOrderItemVo> {
private static final Logger logger = LoggerFactory.getLogger(PurchaseOrderItemService.class);
@Lazy
@Autowired
@@ -101,4 +107,34 @@ public class PurchaseOrderItemService implements IEntityService<PurchaseOrderIte
public List<PurchaseOrderItem> findAll(Specification<PurchaseOrderItem> spec, Sort sort) {
return repository.findAll(spec, sort);
}
@Override
public void updateByVo(PurchaseOrderItem model, PurchaseOrderItemVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
model.setRefId(vo.getRefId());
model.setQuantity(vo.getQuantity());
model.setPrice(vo.getPrice());
model.setTaxRate(vo.getTaxRate());
model.setExclusiveTaxPrice(vo.getExclusiveTaxPrice());
model.setArriveDate(vo.getArriveDate());
model.setDescription(vo.getDescription());
if (vo.getOrder() == null) {
model.setOrder(null);
} else {
model.setOrder(SpringApp.getBean(PurchaseOrdersService.class).findById(vo.getOrder()));
}
if(vo.getInventoryId() == null) {
model.setInventory(null);
} else {
model.setInventory(SpringApp.getBean(InventoryService.class).findById(vo.getInventoryId()));
}
}
}

65
server/src/main/java/com/ecep/contract/ds/contract/service/PurchaseOrdersService.java
View File

@@ -18,10 +18,16 @@ import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.PurchaseOrderRepository;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.PurchaseOrder;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.PurchaseOrderVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -30,13 +36,18 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-purchase-order")
public class PurchaseOrdersService implements IEntityService<PurchaseOrder>, QueryService<PurchaseOrder> {
public class PurchaseOrdersService implements IEntityService<PurchaseOrder>, QueryService<PurchaseOrder>,
VoableService<PurchaseOrder, PurchaseOrderVo> {
private static final Logger logger = LoggerFactory.getLogger(PurchaseOrdersService.class);
@Lazy
@Autowired
private PurchaseOrderRepository purchaseOrderRepository;
@Lazy
@Autowired
private EmployeeService employeeService;
@Override
@Cacheable(key = "#p0")
public PurchaseOrder findById(Integer id) {
@@ -126,4 +137,56 @@ public class PurchaseOrdersService implements IEntityService<PurchaseOrder>, Que
};
return purchaseOrderRepository.findAll(spec, Pageable.ofSize(10)).getContent();
}
@Override
public void updateByVo(PurchaseOrder model, PurchaseOrderVo vo) {
if (model == null || vo == null) {
throw new ServiceException("实体或VO对象不能为空");
}
// 设置基础属性
model.setCode(vo.getCode());
model.setRefId(vo.getRefId());
model.setVendorCode(vo.getVendorCode());
model.setDescription(vo.getDescription());
// 更新负责人信息
if (vo.getContractId() == null) {
model.setContract(null);
} else {
model.setContract(SpringApp.getBean(ContractService.class).findById(vo.getContractId()));
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
// 更新采购人信息
if (vo.getEmployeeId() == null) {
model.setEmployee(null);
} else {
model.setEmployee(employeeService.findById(vo.getEmployeeId()));
}
// 更新制单人信息
if (vo.getMakerId() == null) {
model.setMaker(null);
} else {
model.setMaker(employeeService.findById(vo.getMakerId()));
}
model.setMakerDate(vo.getMakerDate());
model.setModifyDate(vo.getModifyDate());
// 更新审核人信息
if (vo.getVerifierId() == null) {
model.setVerifier(null);
} else {
model.setVerifier(employeeService.findById(vo.getVerifierId()));
}
model.setVerifierDate(vo.getVerifierDate());
// 更新关闭人信息
if (vo.getCloserId() == null) {
model.setCloser(null);
} else {
model.setCloser(employeeService.findById(vo.getCloserId()));
}
model.setCloserDate(vo.getCloserDate());
}
}

68
server/src/main/java/com/ecep/contract/ds/contract/service/SaleOrdersService.java
View File

@@ -1,15 +1,7 @@
package com.ecep.contract.ds.contract.service;
import com.ecep.contract.EntityService;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.MyRepository;
import com.ecep.contract.ds.contract.repository.SalesOrderRepository;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.PurchaseOrder;
import com.ecep.contract.model.SalesOrder;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,14 +10,21 @@ import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.cache.annotation.Caching;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.List;
import com.ecep.contract.EntityService;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.SalesOrderRepository;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.SalesOrder;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.SalesOrderVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
* 合同服务
@@ -33,7 +32,8 @@ import java.util.List;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-sale-order")
public class SaleOrdersService extends EntityService<SalesOrder, Integer> implements IEntityService<SalesOrder>, QueryService<SalesOrder> {
public class SaleOrdersService extends EntityService<SalesOrder, Integer>
implements IEntityService<SalesOrder>, QueryService<SalesOrder>, VoableService<SalesOrder, SalesOrderVo> {
private static final Logger logger = LoggerFactory.getLogger(SaleOrdersService.class);
@Lazy
@@ -55,7 +55,6 @@ public class SaleOrdersService extends EntityService<SalesOrder, Integer> implem
return salesOrderRepository.findById(id).orElse(null);
}
@Override
protected Specification<SalesOrder> buildParameterSpecification(JsonNode paramsNode) {
Specification<SalesOrder> spec = null;
@@ -100,6 +99,41 @@ public class SaleOrdersService extends EntityService<SalesOrder, Integer> implem
salesOrderRepository.delete(order);
}
@Override
public void updateByVo(SalesOrder model, SalesOrderVo vo) {
// 更新基本属性
model.setCode(vo.getCode());
model.setMakerDate(vo.getMakerDate());
model.setVerifierDate(vo.getVerifierDate());
model.setDescription(vo.getDescription());
// 处理关联对象
if (vo.getContractId() == null) {
model.setContract(null);
} else {
model.setContract(SpringApp.getBean(ContractService.class).findById(vo.getContractId()));
}
if (vo.getEmployeeId() == null) {
model.setEmployee(null);
} else {
model.setEmployee(SpringApp.getBean(EmployeeService.class).findById(vo.getEmployeeId()));
}
if (vo.getMakerId() == null) {
model.setMaker(null);
} else {
model.setMaker(SpringApp.getBean(EmployeeService.class).findById(vo.getMakerId()));
}
if (vo.getVerifierId() == null) {
model.setVerifier(null);
} else {
model.setVerifier(SpringApp.getBean(EmployeeService.class).findById(vo.getVerifierId()));
}
// active字段在SalesOrder实体类中不存在，不需要设置
}
public List<SalesOrder> findAllByContract(Contract contract) {
return salesOrderRepository.findAllByContract(contract);

103
server/src/main/java/com/ecep/contract/ds/contract/service/SalesBillVoucherService.java
View File

@@ -2,12 +2,6 @@ package com.ecep.contract.ds.contract.service;
import java.util.List;
import com.ecep.contract.EntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.MyRepository;
import com.ecep.contract.model.SalesOrder;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,13 +15,21 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ecep.contract.EntityService;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.ds.contract.repository.SalesBillVoucherItemRepository;
import com.ecep.contract.ds.contract.repository.SalesBillVoucherRepository;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.model.SalesBillVoucher;
import com.ecep.contract.model.SalesBillVoucherItem;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.SalesBillVoucherVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
* 采购账单凭证服务
@@ -35,7 +37,9 @@ import com.ecep.contract.model.SalesBillVoucherItem;
@Lazy
@Service
@CacheConfig(cacheNames = "sales-bill-voucher")
public class SalesBillVoucherService extends EntityService<SalesBillVoucher, Integer> implements IEntityService<SalesBillVoucher>, QueryService<SalesBillVoucher> {
public class SalesBillVoucherService extends EntityService<SalesBillVoucher, Integer>
implements IEntityService<SalesBillVoucher>, QueryService<SalesBillVoucher>,
VoableService<SalesBillVoucher, SalesBillVoucherVo> {
private static final Logger logger = LoggerFactory.getLogger(SalesBillVoucherService.class);
@Lazy
@@ -65,8 +69,7 @@ public class SalesBillVoucherService extends EntityService<SalesBillVoucher, Int
return (root, query, builder) -> {
return builder.or(
builder.like(root.get("name"), "%" + searchText + "%"),
builder.like(root.get("code"), "%" + searchText + "%")
);
builder.like(root.get("code"), "%" + searchText + "%"));
};
}
@@ -81,27 +84,22 @@ public class SalesBillVoucherService extends EntityService<SalesBillVoucher, Int
* @param voucher 要保存的实体对象
* @return 返回异步调用
*/
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
})
public SalesBillVoucher save(SalesBillVoucher voucher) {
return salesBillVoucherRepository.save(voucher);
}
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
})
public void delete(SalesBillVoucher order) {
salesBillVoucherRepository.delete(order);
}
@Override
protected Specification<SalesBillVoucher> buildParameterSpecification(JsonNode paramsNode) {
Specification<SalesBillVoucher> spec = null;
@@ -121,20 +119,16 @@ public class SalesBillVoucherService extends EntityService<SalesBillVoucher, Int
* @param item 要保存的实体对象
* @return 返回异步调用
*/
@Caching(
evict = {
@CacheEvict(key = "'item-'+#p0.id")
}
)
@Caching(evict = {
@CacheEvict(key = "'item-'+#p0.id")
})
public SalesBillVoucherItem save(SalesBillVoucherItem item) {
return salesBillVoucherItemRepository.save(item);
}
@Caching(
evict = {
@CacheEvict(key = "'item-'+#p0.id")
}
)
@Caching(evict = {
@CacheEvict(key = "'item-'+#p0.id")
})
public void delete(SalesBillVoucherItem order) {
salesBillVoucherItemRepository.delete(order);
}
@@ -154,4 +148,47 @@ public class SalesBillVoucherService extends EntityService<SalesBillVoucher, Int
public List<SalesBillVoucherItem> findAllItems(Specification<SalesBillVoucherItem> spec, Sort sort) {
return salesBillVoucherItemRepository.findAll(spec, sort);
}
@Override
public void updateByVo(SalesBillVoucher model, SalesBillVoucherVo vo) {
// 更新基本属性
model.setRefId(vo.getRefId());
model.setCode(vo.getCode());
model.setMakerDate(vo.getMakerDate());
model.setModifyDate(vo.getModifyDate());
model.setVerifierDate(vo.getVerifierDate());
model.setDescription(vo.getDescription());
// 处理关联对象
if (vo.getCompanyId() == null) {
model.setCompany(null);
} else {
model.setCompany(SpringApp.getBean(CompanyService.class).findById(vo.getCompanyId()));
}
if (vo.getOrderId() == null) {
model.setOrder(null);
} else {
model.setOrder(SpringApp.getBean(SaleOrdersService.class).findById(vo.getOrderId()));
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getEmployeeId() == null) {
model.setEmployee(null);
} else {
model.setEmployee(employeeService.findById(vo.getEmployeeId()));
}
if (vo.getMakerId() == null) {
model.setMaker(null);
} else {
model.setMaker(employeeService.findById(vo.getMakerId()));
}
if (vo.getVerifierId() == null) {
model.setVerifier(null);
} else {
model.setVerifier(employeeService.findById(vo.getVerifierId()));
}
}
}

70
server/src/main/java/com/ecep/contract/ds/contract/service/SalesOrderItemService.java
View File

@@ -1,32 +1,32 @@
package com.ecep.contract.ds.contract.service;
import java.util.List;
import com.ecep.contract.EntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.SalesOrder;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.cache.annotation.Caching;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.EntityService;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.repository.SalesOrderItemRepository;
import com.ecep.contract.model.SalesOrderItem;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.SalesOrderItemVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "contract-sale-order-item")
public class SalesOrderItemService extends EntityService<SalesOrderItem, Integer> implements IEntityService<SalesOrderItem>, QueryService<SalesOrderItem> {
public class SalesOrderItemService extends EntityService<SalesOrderItem, Integer>
implements IEntityService<SalesOrderItem>, QueryService<SalesOrderItem>,
VoableService<SalesOrderItem, SalesOrderItemVo> {
@Lazy
@Autowired
private SalesOrderItemRepository repository;
@@ -47,15 +47,13 @@ public class SalesOrderItemService extends EntityService<SalesOrderItem, Integer
return repository.findById(id).orElse(null);
}
@Override
protected Specification<SalesOrderItem> buildSearchSpecification(String searchText) {
return (root, query, builder) -> {
return builder.or(
builder.like(root.get("code"), "%" + searchText + "%"),
builder.like(root.get("name"), "%" + searchText + "%"),
builder.like(root.get("description"), "%" + searchText + "%")
);
builder.like(root.get("description"), "%" + searchText + "%"));
};
}
@@ -67,23 +65,47 @@ public class SalesOrderItemService extends EntityService<SalesOrderItem, Integer
return spec;
}
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
})
@Override
public void delete(SalesOrderItem entity) {
repository.delete(entity);
}
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
})
@Override
public SalesOrderItem save(SalesOrderItem entity) {
return repository.save(entity);
}
@Override
public void updateByVo(SalesOrderItem model, SalesOrderItemVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
model.setCode(vo.getCode());
model.setName(vo.getName());
model.setQuantity(vo.getQuantity());
model.setPrice(vo.getPrice());
model.setTaxRate(vo.getTaxRate());
model.setExclusiveTaxPrice(vo.getExclusiveTaxPrice());
model.setStartDate(vo.getStartDate());
model.setEndDate(vo.getEndDate());
model.setDescription(vo.getDescription());
if (vo.getOrderId() == null) {
model.setOrder(null);
} else {
model.setOrder(SpringApp.getBean(SaleOrdersService.class).findById(vo.getOrderId()));
}
}
}

36
server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerEvaluationFormFileService.java
View File

@@ -17,19 +17,24 @@ import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.customer.repository.CompanyCustomerEvaluationFormFileRepository;
import com.ecep.contract.model.CompanyCustomer;
import com.ecep.contract.model.CompanyCustomerEvaluationFormFile;
import com.ecep.contract.model.CompanyCustomerFile;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.CompanyCustomerEvaluationFormFileVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "company-customer-evaluation-form-file")
public class CompanyCustomerEvaluationFormFileService
implements IEntityService<CompanyCustomerEvaluationFormFile>, QueryService<CompanyCustomerEvaluationFormFile> {
implements IEntityService<CompanyCustomerEvaluationFormFile>, QueryService<CompanyCustomerEvaluationFormFile>,
VoableService<CompanyCustomerEvaluationFormFile, CompanyCustomerEvaluationFormFileVo> {
private static final Logger logger = LoggerFactory.getLogger(CompanyCustomerEvaluationFormFileService.class);
@Lazy
@@ -127,4 +132,33 @@ public class CompanyCustomerEvaluationFormFileService
return repository.findByCustomerFile(customerFile);
}
@Override
public void updateByVo(CompanyCustomerEvaluationFormFile model, CompanyCustomerEvaluationFormFileVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
// 映射基本属性
model.setCatalog(vo.getCatalog());
model.setLevel(vo.getLevel());
model.setCreditLevel(vo.getCreditLevel());
model.setScore1(vo.getScore1());
model.setScore2(vo.getScore2());
model.setScore3(vo.getScore3());
model.setScore4(vo.getScore4());
model.setScore5(vo.getScore5());
model.setScoreTemplateVersion(vo.getScoreTemplateVersion());
if (vo.getCustomerFile() != null) {
CompanyCustomerFileService service = SpringApp.getBean(CompanyCustomerFileService.class);
model.setCustomerFile(service.findById(vo.getCustomerFile()));
} else {
model.setCustomerFile(null);
}
}
}

32
server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerFileService.java
View File

@@ -36,7 +36,10 @@ import com.ecep.contract.model.CompanyCustomer;
import com.ecep.contract.model.CompanyCustomerEvaluationFormFile;
import com.ecep.contract.model.CompanyCustomerFile;
import com.ecep.contract.model.Contract;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.CompanyCustomerFileVo;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.persistence.criteria.Path;
@@ -45,7 +48,8 @@ import jakarta.persistence.criteria.Path;
@Service
@CacheConfig(cacheNames = "company-customer-file")
public class CompanyCustomerFileService
implements IEntityService<CompanyCustomerFile>, QueryService<CompanyCustomerFile> {
implements IEntityService<CompanyCustomerFile>, QueryService<CompanyCustomerFile>,
VoableService<CompanyCustomerFile, CompanyCustomerFileVo> {
private static final Logger logger = LoggerFactory.getLogger(CompanyCustomerFileService.class);
@Lazy
@Autowired
@@ -261,4 +265,30 @@ public class CompanyCustomerFileService
return companyCustomerEvaluationFormFileRepository.findAll(spec, Pageable.ofSize(10)).getContent();
}
@Override
public void updateByVo(CompanyCustomerFile model, CompanyCustomerFileVo vo) {
if (model == null) {
throw new ServiceException("companyCustomerFile is null");
}
if (vo == null) {
throw new ServiceException("companyCustomerFileVo is null");
}
model.setFilePath(vo.getFilePath());
model.setType(vo.getType());
model.setFilePath(vo.getFilePath());
model.setEditFilePath(vo.getEditFilePath());
model.setSignDate(vo.getSignDate());
model.setValid(vo.isValid());
if (vo.getCustomer() != null) {
CompanyCustomerService service = SpringApp.getBean(CompanyCustomerService.class);
model.setCustomer(service.findById(vo.getCustomer()));
} else {
model.setCustomer(null);
}
}
}

45
server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerFileTypeService.java
View File

@@ -1,14 +1,8 @@
package com.ecep.contract.ds.customer.service;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.customer.repository.CompanyCustomerFileTypeLocalRepository;
import com.ecep.contract.model.CompanyCustomerFileTypeLocal;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.annotation.Resource;
import java.util.Locale;
import java.util.Map;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
@@ -20,13 +14,25 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Locale;
import java.util.Map;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.customer.repository.CompanyCustomerFileTypeLocalRepository;
import com.ecep.contract.model.CompanyCustomerFileTypeLocal;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.CompanyCustomerFileTypeLocalVo;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.annotation.Resource;
@Lazy
@Service
@CacheConfig(cacheNames = "customer-file-type")
public class CompanyCustomerFileTypeService implements IEntityService<CompanyCustomerFileTypeLocal>, QueryService<CompanyCustomerFileTypeLocal> {
public class CompanyCustomerFileTypeService implements IEntityService<CompanyCustomerFileTypeLocal>, QueryService<CompanyCustomerFileTypeLocal>,
VoableService<CompanyCustomerFileTypeLocal, CompanyCustomerFileTypeLocalVo> {
@Resource
private CompanyCustomerFileTypeLocalRepository repository;
@@ -91,4 +97,19 @@ public class CompanyCustomerFileTypeService implements IEntityService<CompanyCus
public void delete(CompanyCustomerFileTypeLocal entity) {
repository.delete(entity);
}
@Override
public void updateByVo(CompanyCustomerFileTypeLocal model, CompanyCustomerFileTypeLocalVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
// 映射基本属性
model.setType(vo.getType());
model.setLang(vo.getLang());
model.setValue(vo.getValue());
}
}

20
server/src/main/java/com/ecep/contract/ds/customer/service/CustomerCatalogService.java
View File

@@ -7,6 +7,9 @@ import com.ecep.contract.ds.customer.repository.CustomerCatalogRepository;
import com.ecep.contract.model.CustomerCatalog;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.CustomerCatalogVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -27,7 +30,8 @@ import java.util.List;
@Lazy
@Service
@CacheConfig(cacheNames = "customer-catalog")
public class CustomerCatalogService implements IEntityService<CustomerCatalog>, QueryService<CustomerCatalog> {
public class CustomerCatalogService implements IEntityService<CustomerCatalog>, QueryService<CustomerCatalog>,
VoableService<CustomerCatalog, CustomerCatalogVo> {
@Lazy
@Autowired
private CustomerCatalogRepository repository;
@@ -148,4 +152,18 @@ public class CustomerCatalogService implements IEntityService<CustomerCatalog>,
return repository.findAll(spec, pageable);
}
@Override
public void updateByVo(CustomerCatalog model, CustomerCatalogVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
// 映射基本属性
model.setCode(vo.getCode());
model.setName(vo.getName());
model.setDescription(vo.getDescription());
}
}

22
server/src/main/java/com/ecep/contract/ds/customer/service/CustomerFileTypeService.java
View File

@@ -24,10 +24,15 @@ import com.ecep.contract.model.CustomerFileTypeLocal;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.CustomerFileTypeLocalVo;
@Lazy
@Service
@CacheConfig(cacheNames = "customer-file-type")
public class CustomerFileTypeService implements IEntityService<CustomerFileTypeLocal>, QueryService<CustomerFileTypeLocal> {
public class CustomerFileTypeService implements IEntityService<CustomerFileTypeLocal>, QueryService<CustomerFileTypeLocal>,
VoableService<CustomerFileTypeLocal, CustomerFileTypeLocalVo> {
@Lazy
@Autowired
private CustomerFileTypeLocalRepository repository;
@@ -95,4 +100,19 @@ public class CustomerFileTypeService implements IEntityService<CustomerFileTypeL
public CustomerFileTypeLocal save(CustomerFileTypeLocal entity) {
return repository.save(entity);
}
@Override
public void updateByVo(CustomerFileTypeLocal model, CustomerFileTypeLocalVo vo) {
if (model == null) {
throw new ServiceException("实体对象不能为空");
}
if (vo == null) {
throw new ServiceException("VO对象不能为空");
}
// 映射基本属性
model.setType(vo.getType());
model.setLang(vo.getLang());
model.setValue(vo.getValue());
}
}

33
server/src/main/java/com/ecep/contract/ds/other/service/EmployeeAuthBindService.java
View File

@@ -2,7 +2,6 @@ package com.ecep.contract.ds.other.service;
import java.util.List;
import com.ecep.contract.util.SpecificationUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.context.annotation.Lazy;
@@ -15,15 +14,20 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.other.repository.EmployeeAuthBindRepository;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.EmployeeAuthBind;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.EmployeeAuthBindVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "employee-auth-bind")
public class EmployeeAuthBindService implements IEntityService<EmployeeAuthBind>, QueryService<EmployeeAuthBind> {
public class EmployeeAuthBindService implements IEntityService<EmployeeAuthBind>, QueryService<EmployeeAuthBind>,
VoableService<EmployeeAuthBind, EmployeeAuthBindVo> {
@Lazy
@Autowired
private EmployeeAuthBindRepository repository;
@@ -75,4 +79,29 @@ public class EmployeeAuthBindService implements IEntityService<EmployeeAuthBind>
public List<EmployeeAuthBind> findAllByEmployee(Employee employee, Sort sort) {
return repository.findAllByEmployee(employee, sort);
}
@Override
public void updateByVo(EmployeeAuthBind model, EmployeeAuthBindVo vo) {
// 从VO映射属性到实体
model.setIp(vo.getIp());
model.setMac(vo.getMac());
model.setCreateTime(vo.getCreateTime());
model.setUpdateTime(vo.getUpdateTime());
model.setDescription(vo.getDescription());
// employee和updater属性需要通过ID查找对应的实体
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getEmployeeId() != null) {
Employee employee = employeeService.findById(vo.getEmployeeId());
model.setEmployee(employee);
} else {
model.setEmployee(null);
}
if (vo.getUpdaterId() != null) {
Employee updater = employeeService.findById(vo.getUpdaterId());
model.setUpdater(updater);
} else {
model.setUpdater(null);
}
}
}

30
server/src/main/java/com/ecep/contract/ds/other/service/EmployeeLoginHistoryService.java
View File

@@ -11,16 +11,21 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.fasterxml.jackson.databind.JsonNode;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.other.repository.EmployeeLoginHistoryRepository;
import com.ecep.contract.model.EmployeeLoginHistory;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.EmployeeLoginHistoryVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "employee-login-history")
public class EmployeeLoginHistoryService
implements IEntityService<EmployeeLoginHistory>, QueryService<EmployeeLoginHistory> {
implements IEntityService<EmployeeLoginHistory>, QueryService<EmployeeLoginHistory>,
VoableService<EmployeeLoginHistory, EmployeeLoginHistoryVo> {
@Lazy
@Autowired
private EmployeeLoginHistoryRepository repository;
@@ -68,4 +73,25 @@ public class EmployeeLoginHistoryService
public EmployeeLoginHistory save(EmployeeLoginHistory entity) {
return repository.save(entity);
}
@Override
public void updateByVo(EmployeeLoginHistory model, EmployeeLoginHistoryVo vo) {
if (model == null) {
throw new ServiceException("EmployeeLoginHistory cannot be null");
}
if (vo == null) {
throw new ServiceException("EmployeeLoginHistoryVo cannot be null");
}
// Map properties from VO to entity (id属性不更新)
if (vo.getEmployeeId() == null) {
model.setEmployee(null);
} else {
model.setEmployee(SpringApp.getBean(EmployeeService.class).findById(vo.getEmployeeId()));
}
model.setIp(vo.getIp());
model.setMac(vo.getMac());
model.setLoginTime(vo.getLoginTime());
model.setActiveTime(vo.getActiveTime());
}
}

36
server/src/main/java/com/ecep/contract/ds/project/service/DeliverySignMethodService.java
View File

@@ -2,10 +2,6 @@ package com.ecep.contract.ds.project.service;
import java.util.List;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -19,14 +15,21 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.project.repository.ProductDeliverySignMethodRepository;
import com.ecep.contract.model.DeliverySignMethod;
import com.ecep.contract.model.ProjectSaleType;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.DeliverySignMethodVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "project-sign-method")
public class DeliverySignMethodService implements IEntityService<DeliverySignMethod>, QueryService<DeliverySignMethod> {
public class DeliverySignMethodService implements IEntityService<DeliverySignMethod>, QueryService<DeliverySignMethod>,
VoableService<DeliverySignMethod, DeliverySignMethodVo> {
@Lazy
@Autowired
private ProductDeliverySignMethodRepository deliverySignMethodRepository;
@@ -48,7 +51,7 @@ public class DeliverySignMethodService implements IEntityService<DeliverySignMet
spec = getSpecification(paramsNode.get("searchText").asText());
}
// field
// spec = SpecificationUtils.andParam(spec, paramsNode, "company");
// spec = SpecificationUtils.andParam(spec, paramsNode, "company");
return findAll(spec, pageable);
}
@@ -99,4 +102,25 @@ public class DeliverySignMethodService implements IEntityService<DeliverySignMet
return null;
}
@Override
public void updateByVo(DeliverySignMethod entity, DeliverySignMethodVo vo) {
if (entity == null) {
throw new ServiceException("DeliverySignMethod is null");
}
if (vo == null) {
throw new ServiceException("DeliverySignMethodVo is null");
}
entity.setName(vo.getName());
entity.setCode(vo.getCode());
entity.setDescription(vo.getDescription());
if (vo.getSaleTypeId() != null) {
ProjectSaleTypeService saleTypeService = SpringApp.getBean(ProjectSaleTypeService.class);
entity.setSaleType(saleTypeService.findById(vo.getSaleTypeId()));
} else {
entity.setSaleType(null);
}
}
}

65
server/src/main/java/com/ecep/contract/ds/project/service/ProjectBidService.java
View File

@@ -3,10 +3,6 @@ package com.ecep.contract.ds.project.service;
import java.time.LocalDateTime;
import java.util.List;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,13 +14,21 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.customer.service.CompanyCustomerEvaluationFormFileService;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.project.repository.ProjectBidRepository;
import com.ecep.contract.model.Project;
import com.ecep.contract.model.ProjectBid;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ProjectBidVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class ProjectBidService implements IEntityService<ProjectBid>, QueryService<ProjectBid> {
public class ProjectBidService implements IEntityService<ProjectBid>, QueryService<ProjectBid>, VoableService<ProjectBid, ProjectBidVo> {
private static final Logger logger = LoggerFactory.getLogger(ProjectBidService.class);
@Lazy
@@ -84,4 +88,55 @@ public class ProjectBidService implements IEntityService<ProjectBid>, QueryServi
public List<ProjectBid> findAll(Specification<ProjectBid> spec, Sort sort) {
return repository.findAll(spec, sort);
}
@Override
public void updateByVo(ProjectBid model, ProjectBidVo vo) {
if (model == null || vo == null) {
return;
}
// 设置基本属性
model.setLevel(vo.getLevel());
model.setAmount(vo.getAmount());
model.setStandardPayWay(vo.isStandardPayWay());
model.setNoStandardPayWayText(vo.getNoStandardPayWayText());
model.setStandardContractText(vo.isStandardContractText());
model.setNoStandardContractText(vo.getNoStandardContractText());
model.setAuthorizationFile(vo.getAuthorizationFile());
model.setBidAcceptanceLetterFile(vo.getBidAcceptanceLetterFile());
model.setApplyTime(vo.getApplyTime());
model.setAuthorizationTime(vo.getAuthorizationTime());
model.setDescription(vo.getDescription());
// 处理关联实体
if (vo.getProject() == null) {
model.setProject(null);
} else {
model.setProject(SpringApp.getBean(ProjectService.class).findById(vo.getProject()));
}
if (vo.getEvaluationFileId() == null) {
model.setEvaluationFile(null);
} else {
model.setEvaluationFile(SpringApp.getBean(CompanyCustomerEvaluationFormFileService.class).findById(vo.getEvaluationFileId()));
}
if (vo.getCostId() == null) {
model.setCost(null);
} else {
model.setCost(SpringApp.getBean(ProjectCostService.class).findById(vo.getCostId()));
}
if (vo.getApplicantId() == null) {
model.setApplicant(null);
} else {
model.setApplicant(SpringApp.getBean(EmployeeService.class).findById(vo.getApplicantId()));
}
if (vo.getAuthorizerId() == null) {
model.setAuthorizer(null);
} else {
model.setAuthorizer(SpringApp.getBean(EmployeeService.class).findById(vo.getAuthorizerId()));
}
}
}

72
server/src/main/java/com/ecep/contract/ds/project/service/ProjectCostItemService.java
View File

@@ -7,14 +7,21 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.other.service.InventoryService;
import com.ecep.contract.ds.project.repository.ProjectCostItemRepository;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.Inventory;
import com.ecep.contract.model.ProjectCost;
import com.ecep.contract.model.ProjectCostItem;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ProjectCostItemVo;
@@ -22,11 +29,18 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class ProjectCostItemService implements IEntityService<ProjectCostItem>, QueryService<ProjectCostItem>, VoableService<ProjectCostItem, ProjectCostItemVo> {
public class ProjectCostItemService implements IEntityService<ProjectCostItem>, QueryService<ProjectCostItem>,
VoableService<ProjectCostItem, ProjectCostItemVo> {
private final AuthenticationManager authenticationManager;
@Lazy
@Autowired
private ProjectCostItemRepository repository;
ProjectCostItemService(AuthenticationManager authenticationManager) {
this.authenticationManager = authenticationManager;
}
@Override
public ProjectCostItem findById(Integer id) {
return repository.findById(id).orElse(null);
@@ -76,8 +90,58 @@ public class ProjectCostItemService implements IEntityService<ProjectCostItem>,
@Override
public void updateByVo(ProjectCostItem item, ProjectCostItemVo vo) {
throw new UnsupportedOperationException("Not supported yet.");
}
if (item == null) {
throw new ServiceException("ProjectCostItem is null");
}
if (vo == null) {
throw new ServiceException("ProjectCostItemVo is null");
}
item.setTitle(vo.getTitle());
item.setSpecification(vo.getSpecification());
item.setUnit(vo.getUnit());
item.setInTaxRate(vo.getInTaxRate());
item.setInExclusiveTaxPrice(vo.getInExclusiveTaxPrice());
item.setInQuantity(vo.getInQuantity());
item.setOutTaxRate(vo.getOutTaxRate());
item.setOutExclusiveTaxPrice(vo.getOutExclusiveTaxPrice());
item.setOutQuantity(vo.getOutQuantity());
item.setCreateDate(vo.getCreateDate());
item.setUpdateDate(vo.getUpdateDate());
item.setRemark(vo.getRemark());
if (vo.getCostId() == null) {
item.setCost(null);
} else {
ProjectCostService costService = SpringApp.getBean(ProjectCostService.class);
ProjectCost cost = costService.findById(vo.getCostId());
item.setCost(cost);
}
if (vo.getInventoryId() == null) {
item.setInventory(null);
} else {
InventoryService inventoryService = SpringApp.getBean(InventoryService.class);
Inventory inventory = inventoryService.findById(vo.getInventoryId());
item.setInventory(inventory);
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getCreatorId() == null) {
item.setCreator(null);
} else {
Employee creator = employeeService.findById(vo.getCreatorId());
item.setCreator(creator);
}
if (vo.getUpdaterId() == null) {
item.setUpdater(null);
} else {
Employee updater = employeeService.findById(vo.getUpdaterId());
item.setUpdater(updater);
}
}
}

104
server/src/main/java/com/ecep/contract/ds/project/service/ProjectCostService.java
View File

@@ -3,10 +3,6 @@ package com.ecep.contract.ds.project.service;
import java.util.Comparator;
import java.util.List;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,21 +15,31 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.contract.service.ContractService;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.project.repository.ProjectCostRepository;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.Project;
import com.ecep.contract.model.ProjectCost;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ProjectCostVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class ProjectCostService implements IEntityService<ProjectCost>, QueryService<ProjectCost> {
public class ProjectCostService
implements IEntityService<ProjectCost>, QueryService<ProjectCost>, VoableService<ProjectCost, ProjectCostVo> {
private static final Logger logger = LoggerFactory.getLogger(ProjectCostService.class);
@Lazy
@Autowired
private ProjectCostRepository repository;
public ProjectCost findById(Integer id) {
return repository.findById(id).orElse(null);
}
@@ -84,7 +90,6 @@ public class ProjectCostService implements IEntityService<ProjectCost>, QuerySer
return repository.findAllByProject(project);
}
public ProjectCost save(ProjectCost cost) {
return repository.save(cost);
}
@@ -115,4 +120,89 @@ public class ProjectCostService implements IEntityService<ProjectCost>, QuerySer
public List<ProjectCost> findAll(Specification<ProjectCost> spec, Sort sort) {
return repository.findAll(spec, sort);
}
@Override
public void updateByVo(ProjectCost entity, ProjectCostVo vo) {
if (entity == null) {
throw new ServiceException("ProjectCost is null");
}
if (vo == null) {
throw new ServiceException("ProjectCostVo is null");
}
// 基本字段映射
// 准付款方式 和 合同文本
entity.setStandardPayWay(vo.isStandardPayWay());
entity.setNoStandardPayWayText(vo.getNoStandardPayWayText());
entity.setStandardContractText(vo.isStandardContractText());
entity.setNoStandardContractText(vo.getNoStandardContractText());
// 印花税率和税费
entity.setStampTax(vo.getStampTax());
entity.setStampTaxFee(vo.getStampTaxFee());
// 其他服务费用和运费
entity.setOnSiteServiceFee(vo.getOnSiteServiceFee());
entity.setAssemblyServiceFee(vo.getAssemblyServiceFee());
entity.setTechnicalServiceFee(vo.getTechnicalServiceFee());
entity.setBidServiceFee(vo.getBidServiceFee());
entity.setFreightCost(vo.getFreightCost());
entity.setGuaranteeLetterFee(vo.getGuaranteeLetterFee());
// 营业税及附加费
entity.setTaxAndSurcharges(vo.getTaxAndSurcharges());
entity.setTaxAndSurchargesFee(vo.getTaxAndSurchargesFee());
// 数量和金额
entity.setInQuantities(vo.getInQuantities());
entity.setInTaxAmount(vo.getInTaxAmount());
entity.setInExclusiveTaxAmount(vo.getInExclusiveTaxAmount());
entity.setOutQuantities(vo.getOutQuantities());
entity.setOutTaxAmount(vo.getOutTaxAmount());
entity.setOutExclusiveTaxAmount(vo.getOutExclusiveTaxAmount());
// 毛利率
entity.setGrossProfitMargin(vo.getGrossProfitMargin());
//
entity.setApplyTime(vo.getApplyTime());
entity.setAuthorizationTime(vo.getAuthorizationTime());
entity.setAuthorizationFile(vo.getAuthorizationFile());
entity.setImportLock(vo.isImportLock());
entity.setDescription(vo.getDescription());
entity.setVersion(vo.getVersion());
// 处理关联实体
if (vo.getProject() != null) {
Project project = SpringApp.getBean(ProjectService.class).findById(vo.getProject());
entity.setProject(project);
} else {
entity.setProject(null);
}
if (vo.getContractId() != null) {
Contract contract = SpringApp.getBean(ContractService.class).findById(vo.getContractId());
if (contract != null) {
entity.setContract(contract);
}
} else {
entity.setContract(null);
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getApplicantId() != null) {
Employee applicant = employeeService.findById(vo.getApplicantId());
if (applicant != null) {
entity.setApplicant(applicant);
}
} else {
entity.setApplicant(null);
}
if (vo.getAuthorizerId() != null) {
Employee authorizer = employeeService.findById(vo.getAuthorizerId());
if (authorizer != null) {
entity.setAuthorizer(authorizer);
}
}
}
}

32
server/src/main/java/com/ecep/contract/ds/project/service/ProjectFileService.java
View File

@@ -5,10 +5,6 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,13 +18,20 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.ProjectFileType;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.project.repository.ProjectFileRepository;
import com.ecep.contract.model.Project;
import com.ecep.contract.model.ProjectFile;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ProjectFileVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class ProjectFileService implements IEntityService<ProjectFile>, QueryService<ProjectFile> {
public class ProjectFileService
implements IEntityService<ProjectFile>, QueryService<ProjectFile>, VoableService<ProjectFile, ProjectFileVo> {
private static final Logger logger = LoggerFactory.getLogger(ProjectFileService.class);
@Autowired
@@ -98,9 +101,26 @@ public class ProjectFileService implements IEntityService<ProjectFile>, QuerySer
return projectFileRepository.saveAll(files);
}
@Override
public void updateByVo(ProjectFile model, ProjectFileVo vo) {
if (model == null || vo == null) {
return;
}
// 设置基本属性
model.setType(vo.getType());
model.setFilePath(vo.getFilePath());
// 处理关联实体
if (vo.getProjectId() == null) {
model.setProject(null);
} else {
model.setProject(SpringApp.getBean(ProjectService.class).findById(vo.getProjectId()));
}
}
public List<ProjectFile> findAllByProjectAndType(Project project, ProjectFileType type) {
return projectFileRepository.findByProjectAndType(project, type);
}
}

34
server/src/main/java/com/ecep/contract/ds/project/service/ProjectFileTypeService.java
View File

@@ -20,13 +20,18 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.ProjectFileTypeLocalVo;
import java.util.Locale;
import java.util.Map;
@Lazy
@Service
@CacheConfig(cacheNames = "project-file-type")
public class ProjectFileTypeService implements IEntityService<ProjectFileTypeLocal>, QueryService<ProjectFileTypeLocal> {
public class ProjectFileTypeService implements IEntityService<ProjectFileTypeLocal>, QueryService<ProjectFileTypeLocal>,
VoableService<ProjectFileTypeLocal, ProjectFileTypeLocalVo> {
@Lazy
@Autowired
@@ -40,7 +45,8 @@ public class ProjectFileTypeService implements IEntityService<ProjectFileTypeLoc
}
if (paramsNode.has("type")) {
spec = SpecificationUtils.and(spec, (root, query, builder) -> builder.equal(root.get("type"), ProjectFileType.valueOf(paramsNode.get("type").asText())));
spec = SpecificationUtils.and(spec, (root, query, builder) -> builder.equal(root.get("type"),
ProjectFileType.valueOf(paramsNode.get("type").asText())));
}
// field
@@ -70,10 +76,10 @@ public class ProjectFileTypeService implements IEntityService<ProjectFileTypeLoc
}
return (root, query, builder) -> {
return
// builder.or(
builder.like(root.get("type"), "%" + searchText + "%")
// )
;
// builder.or(
builder.like(root.get("type"), "%" + searchText + "%")
// )
;
};
}
@@ -94,4 +100,18 @@ public class ProjectFileTypeService implements IEntityService<ProjectFileTypeLoc
public void delete(ProjectFileTypeLocal entity) {
repository.delete(entity);
}
}
@Override
public void updateByVo(ProjectFileTypeLocal entity, ProjectFileTypeLocalVo vo) {
if (entity == null) {
throw new ServiceException("ProjectFileTypeLocal is null");
}
if (vo == null) {
throw new ServiceException("ProjectFileTypeLocalVo is null");
}
entity.setType(vo.getType());
entity.setLang(vo.getLang());
entity.setValue(vo.getValue());
}
}

66
server/src/main/java/com/ecep/contract/ds/project/service/ProjectQuotationService.java
View File

@@ -3,10 +3,6 @@ package com.ecep.contract.ds.project.service;
import java.time.LocalDateTime;
import java.util.List;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,21 +14,29 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.customer.service.CompanyCustomerEvaluationFormFileService;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.project.repository.ProjectQuotationRepository;
import com.ecep.contract.model.Project;
import com.ecep.contract.model.ProjectQuotation;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ProjectQuotationVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class ProjectQuotationService implements IEntityService<ProjectQuotation>, QueryService<ProjectQuotation> {
public class ProjectQuotationService implements IEntityService<ProjectQuotation>, QueryService<ProjectQuotation>,
VoableService<ProjectQuotation, ProjectQuotationVo> {
private static final Logger logger = LoggerFactory.getLogger(ProjectQuotationService.class);
@Lazy
@Autowired
private ProjectQuotationRepository repository;
public ProjectQuotation findById(Integer id) {
return repository.findById(id).orElse(null);
}
@@ -49,7 +53,7 @@ public class ProjectQuotationService implements IEntityService<ProjectQuotation>
spec = getSpecification(paramsNode.get("searchText").asText());
}
// field
spec = SpecificationUtils.andParam(spec, paramsNode, "project", "applicant","authorizer");
spec = SpecificationUtils.andParam(spec, paramsNode, "project", "applicant", "authorizer");
return findAll(spec, pageable);
}
@@ -70,7 +74,6 @@ public class ProjectQuotationService implements IEntityService<ProjectQuotation>
repository.delete(approval);
}
public ProjectQuotation newInstanceByProject(Project project) {
ProjectQuotation approval = new ProjectQuotation();
approval.setProject(project);
@@ -83,4 +86,49 @@ public class ProjectQuotationService implements IEntityService<ProjectQuotation>
public List<ProjectQuotation> findAll(Specification<ProjectQuotation> spec, Sort sort) {
return repository.findAll(spec, sort);
}
@Override
public void updateByVo(ProjectQuotation entity, ProjectQuotationVo vo) {
if (entity == null) {
throw new ServiceException("ProjectQuotation is null");
}
if (vo == null) {
throw new ServiceException("ProjectQuotationVo is null");
}
entity.setLevel(vo.getLevel());
entity.setStandardPayWay(vo.isStandardPayWay());
entity.setNoStandardPayWayText(vo.getNoStandardPayWayText());
entity.setAmount(vo.getAmount());
entity.setApplyTime(vo.getApplyTime());
entity.setAuthorizationTime(vo.getAuthorizationTime());
entity.setDescription(vo.getDescription());
// 处理关联实体
if (vo.getProject() != null) {
ProjectService projectService = SpringApp.getBean(ProjectService.class);
entity.setProject(projectService.findById(vo.getProject()));
} else {
entity.setProject(null);
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getApplicantId() != null) {
entity.setApplicant(employeeService.findById(vo.getApplicantId()));
} else {
entity.setApplicant(null);
}
if (vo.getAuthorizerId() != null) {
entity.setAuthorizer(employeeService.findById(vo.getAuthorizerId()));
} else {
entity.setAuthorizer(null);
}
if(vo.getEvaluationFileId() != null){
CompanyCustomerEvaluationFormFileService evaluationFileService = SpringApp.getBean(CompanyCustomerEvaluationFormFileService.class);
entity.setEvaluationFile(evaluationFileService.findById(vo.getEvaluationFileId()));
}else{
entity.setEvaluationFile(null);
}
}
}

37
server/src/main/java/com/ecep/contract/ds/project/service/ProjectSaleTypeRequireFileTypeService.java
View File

@@ -2,10 +2,6 @@ package com.ecep.contract.ds.project.service;
import java.util.List;
import com.ecep.contract.QueryService;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -17,14 +13,21 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.ContractFileType;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.project.repository.ProjectSaleTypeRequireFileTypeRepository;
import com.ecep.contract.model.ProjectSaleTypeRequireFileType;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.ProjectSaleTypeRequireFileTypeVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "project-sale-type-require-file-type")
public class ProjectSaleTypeRequireFileTypeService implements IEntityService<ProjectSaleTypeRequireFileType>, QueryService<ProjectSaleTypeRequireFileType> {
public class ProjectSaleTypeRequireFileTypeService implements IEntityService<ProjectSaleTypeRequireFileType>, QueryService<ProjectSaleTypeRequireFileType>, VoableService<ProjectSaleTypeRequireFileType, ProjectSaleTypeRequireFileTypeVo> {
@Lazy
@Autowired
private ProjectSaleTypeRequireFileTypeRepository repository;
@@ -92,5 +95,29 @@ public class ProjectSaleTypeRequireFileTypeService implements IEntityService<Pro
repository.delete(type);
}
@Override
public void updateByVo(ProjectSaleTypeRequireFileType model, ProjectSaleTypeRequireFileTypeVo vo) {
if (model == null || vo == null) {
return;
}
// 设置基本属性
model.setFileType(vo.getFileType());
// 转换frequency从String到ContractFileType.Frequency枚举
if (vo.getFrequency() != null) {
try {
model.setFrequency(ContractFileType.Frequency.valueOf(vo.getFrequency()));
} catch (IllegalArgumentException e) {
// 如果枚举值不存在，保持原来的值
}
}
// 处理关联实体
if (vo.getSaleTypeId() == null) {
model.setSaleType(null);
} else {
model.setSaleType(SpringApp.getBean(ProjectSaleTypeService.class).findById(vo.getSaleTypeId()));
}
}
}

20
server/src/main/java/com/ecep/contract/ds/project/service/ProjectSaleTypeService.java
View File

@@ -26,7 +26,8 @@ import com.ecep.contract.vo.ProjectSaleTypeVo;
@Lazy
@Service
@CacheConfig(cacheNames = "project-sale-type")
public class ProjectSaleTypeService implements IEntityService<ProjectSaleType>, QueryService<ProjectSaleType>, VoableService<ProjectSaleType, ProjectSaleTypeVo> {
public class ProjectSaleTypeService implements IEntityService<ProjectSaleType>, QueryService<ProjectSaleType>,
VoableService<ProjectSaleType, ProjectSaleTypeVo> {
@Lazy
@Autowired
private ProjectSaleTypeRepository saleTypeRepository;
@@ -97,6 +98,10 @@ public class ProjectSaleTypeService implements IEntityService<ProjectSaleType>,
@Override
public void updateByVo(ProjectSaleType saleType, ProjectSaleTypeVo vo) {
if (saleType == null || vo == null) {
return;
}
// 映射基本属性
saleType.setName(vo.getName());
saleType.setCode(vo.getCode());
@@ -104,14 +109,13 @@ public class ProjectSaleTypeService implements IEntityService<ProjectSaleType>,
saleType.setDescription(vo.getDescription());
saleType.setStoreByYear(vo.isStoreByYear());
saleType.setCriticalProjectDecision(vo.isCriticalProjectDecision());
// 处理Double类型的criticalProjectLimit
if (vo.getCriticalProjectLimit() != null) {
saleType.setCriticalProjectLimit(vo.getCriticalProjectLimit());
}
saleType.setCriticalProjectLimit(vo.getCriticalProjectLimit() != null ? vo.getCriticalProjectLimit() : 0);
saleType.setActive(vo.isActive());
saleType.setCriticalProjectLimit(vo.getCriticalProjectLimit());
saleType.setActive(vo.isActive());
// ProjectSaleTypeVo中的created和version字段在ProjectSaleType实体中不存在，这里不做处理
// 如果需要处理，可以添加日志记录或者其他逻辑
}

42
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java vendored
View File

@@ -10,13 +10,18 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.vendor.repository.VendorApprovedFileRepository;
import com.ecep.contract.model.VendorApprovedFile;
import com.ecep.contract.model.VendorApproved;
import com.ecep.contract.model.VendorApprovedFile;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.VendorApprovedFileVo;
@Lazy
@Service
public class VendorApprovedFileService implements IEntityService<VendorApprovedFile> {
public class VendorApprovedFileService
implements IEntityService<VendorApprovedFile>, VoableService<VendorApprovedFile, VendorApprovedFileVo> {
@Lazy
@Autowired
private VendorApprovedFileRepository repository;
@@ -44,15 +49,14 @@ public class VendorApprovedFileService implements IEntityService<VendorApprovedF
return (root, query, builder) -> {
return builder.or(
builder.like(root.get("fileName"), "%" + searchText + "%"),
builder.like(root.get("description"), "%" + searchText + "%")
);
builder.like(root.get("description"), "%" + searchText + "%"));
};
}
/**
* 根据查询规格和分页参数获取供应商已批准文件列表
*
* @param spec 查询规格
* @param spec 查询规格
* @param pageable 分页参数
* @return 分页的文件列表
*/
@@ -86,7 +90,7 @@ public class VendorApprovedFileService implements IEntityService<VendorApprovedF
* 根据已批准列表和文件名查找特定文件
*
* @param approvedList 已批准列表
* @param name 文件名
* @param name 文件名
* @return 找到的文件实体
*/
public VendorApprovedFile findByName(VendorApproved approvedList, String name) {
@@ -102,4 +106,30 @@ public class VendorApprovedFileService implements IEntityService<VendorApprovedF
public List<VendorApprovedFile> findAllByList(VendorApproved list) {
return repository.findAllByListId(list.getId());
}
@Override
public void updateByVo(VendorApprovedFile entity, VendorApprovedFileVo vo) throws ServiceException {
if (entity == null) {
throw new ServiceException("VendorApprovedFile entity cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorApprovedFileVo cannot be null");
}
// 映射基本属性
entity.setFileName(vo.getFileName());
entity.setSignDate(vo.getSignDate());
entity.setDescription(vo.getDescription());
// 处理关联实体
if (vo.getListId() != null) {
VendorApprovedService vendorApprovedService = SpringApp.getBean(VendorApprovedService.class);
VendorApproved vendorApproved = vendorApprovedService.findById(vo.getListId());
if (vendorApproved != null) {
entity.setList(vendorApproved);
}
} else {
entity.setList(null);
}
}
}

68
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java vendored
View File

@@ -3,9 +3,6 @@ package com.ecep.contract.ds.vendor.service;
import java.util.List;
import java.util.stream.Collectors;
import com.ecep.contract.QueryService;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.Page;
@@ -15,20 +12,30 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.service.CompanyOldNameService;
import com.ecep.contract.ds.vendor.repository.VendorApprovedItemRepository;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyOldName;
import com.ecep.contract.model.Vendor;
import com.ecep.contract.model.VendorApprovedItem;
import com.ecep.contract.model.VendorApproved;
import com.ecep.contract.model.VendorApprovedItem;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorApprovedItemVo;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
@Lazy
@Service
public class VendorApprovedItemService implements IEntityService<VendorApprovedItem>, QueryService<VendorApprovedItem> {
public class VendorApprovedItemService implements IEntityService<VendorApprovedItem>, QueryService<VendorApprovedItem>,
VoableService<VendorApprovedItem, VendorApprovedItemVo> {
private final VendorApprovedFileService vendorApprovedFileService;
@Lazy
@Autowired
private VendorApprovedItemRepository repository;
@@ -36,6 +43,10 @@ public class VendorApprovedItemService implements IEntityService<VendorApprovedI
@Autowired
private CompanyOldNameService companyOldNameService;
VendorApprovedItemService(VendorApprovedFileService vendorApprovedFileService) {
this.vendorApprovedFileService = vendorApprovedFileService;
}
@Override
public VendorApprovedItem findById(Integer id) {
return repository.findById(id).orElse(null);
@@ -48,20 +59,19 @@ public class VendorApprovedItemService implements IEntityService<VendorApprovedI
Path<Company> company = vendor.get("company");
List<CompanyOldName> oldNames = companyOldNameService.search(searchText);
Predicate companyPredicate = oldNames.isEmpty() ? builder.like(company.get("name"), "%" + searchText + "%") : builder.or(
builder.like(company.get("name"), "%" + searchText + "%"),
company.get("id").in(oldNames.stream().map(CompanyOldName::getCompanyId).collect(Collectors.toList()))
);
Predicate companyPredicate = oldNames.isEmpty() ? builder.like(company.get("name"), "%" + searchText + "%")
: builder.or(
builder.like(company.get("name"), "%" + searchText + "%"),
company.get("id").in(
oldNames.stream().map(CompanyOldName::getCompanyId).collect(Collectors.toList())));
return builder.or(
builder.and(
vendor.isNotNull(),
builder.and(
company.isNotNull(),
companyPredicate
)),
companyPredicate)),
builder.like(root.get("vendorName"), "%" + searchText + "%"),
builder.like(root.get("description"), "%" + searchText + "%")
);
builder.like(root.get("description"), "%" + searchText + "%"));
};
}
@@ -98,4 +108,36 @@ public class VendorApprovedItemService implements IEntityService<VendorApprovedI
public List<VendorApprovedItem> findAllByListAndVendor(VendorApproved approvedList, Vendor vendor) {
return repository.findAllByListAndVendor(approvedList, vendor);
}
@Override
public void updateByVo(VendorApprovedItem entity, VendorApprovedItemVo vo) throws ServiceException {
if (entity == null) {
throw new ServiceException("VendorApprovedItem entity cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorApprovedItemVo cannot be null");
}
// 映射基本属性
entity.setVendorName(vo.getVendorName());
entity.setType(vo.getType());
entity.setDescription(vo.getDescription());
// 处理关联实体
if (vo.getListId() != null) {
VendorApprovedService vendorApprovedService = SpringApp.getBean(VendorApprovedService.class);
VendorApproved vendorApproved = vendorApprovedService.findById(vo.getListId());
if (vendorApproved != null) {
entity.setList(vendorApproved);
}
}
if (vo.getVendorId() != null) {
VendorService vendorService = SpringApp.getBean(VendorService.class);
Vendor vendor = vendorService.findById(vo.getVendorId());
if (vendor != null) {
entity.setVendor(vendor);
}
}
}
}

60
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java vendored
View File

@@ -1,17 +1,12 @@
package com.ecep.contract.ds.vendor.service;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import com.ecep.contract.IEntityService;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.QueryService;
import com.ecep.contract.constant.CompanyVendorConstant;
import com.ecep.contract.ds.other.service.SysConfService;
import com.ecep.contract.ds.vendor.repository.VendorApprovedRepository;
import com.ecep.contract.model.VendorApprovedFile;
import com.ecep.contract.model.VendorApproved;
import com.ecep.contract.util.FileUtils;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,17 +18,25 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import com.ecep.contract.IEntityService;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.QueryService;
import com.ecep.contract.constant.CompanyVendorConstant;
import com.ecep.contract.ds.other.service.SysConfService;
import com.ecep.contract.ds.vendor.repository.VendorApprovedRepository;
import com.ecep.contract.model.VendorApproved;
import com.ecep.contract.model.VendorApprovedFile;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.FileUtils;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorApprovedVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class VendorApprovedService implements IEntityService<VendorApproved>, QueryService<VendorApproved> {
public class VendorApprovedService implements IEntityService<VendorApproved>, QueryService<VendorApproved>,
VoableService<VendorApproved, VendorApprovedVo> {
private static final Logger logger = LoggerFactory.getLogger(VendorApprovedService.class);
@Lazy
@Autowired
@@ -49,7 +52,6 @@ public class VendorApprovedService implements IEntityService<VendorApproved>, Qu
@Autowired
private SysConfService confService;
public File getBasePath() {
return new File(confService.getString(CompanyVendorConstant.KEY_APPROVED_LIST_BASE_PATH));
}
@@ -195,7 +197,7 @@ public class VendorApprovedService implements IEntityService<VendorApproved>, Qu
return modfied;
}
//update db
// update db
retrieveFiles.forEach(v -> {
v.setList(list);
fileService.save(v);
@@ -212,4 +214,20 @@ public class VendorApprovedService implements IEntityService<VendorApproved>, Qu
return vendorFile;
}
@Override
public void updateByVo(VendorApproved model, VendorApprovedVo vo) {
if (model == null) {
throw new ServiceException("VendorApproved cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorApprovedVo cannot be null");
}
// Map properties from VO to entity
model.setTitle(vo.getTitle());
model.setPublishDate(vo.getPublishDate());
model.setPath(vo.getPath());
model.setDescription(vo.getDescription());
}
}

21
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorCatalogService.java vendored
View File

@@ -17,7 +17,10 @@ import com.ecep.contract.QueryService;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.vendor.repository.VendorClassRepository;
import com.ecep.contract.model.VendorCatalog;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorCatalogVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -27,7 +30,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "vendor-catalog")
public class VendorCatalogService implements IEntityService<VendorCatalog>, QueryService<VendorCatalog> {
public class VendorCatalogService implements IEntityService<VendorCatalog>, QueryService<VendorCatalog>,
VoableService<VendorCatalog, VendorCatalogVo> {
@Lazy
@Autowired
private VendorClassRepository repository;
@@ -82,4 +86,19 @@ public class VendorCatalogService implements IEntityService<VendorCatalog>, Quer
public VendorCatalog save(VendorCatalog entity) {
return repository.save(entity);
}
@Override
public void updateByVo(VendorCatalog model, VendorCatalogVo vo) {
if (model == null) {
throw new ServiceException("VendorCatalog cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorCatalogVo cannot be null");
}
// Map properties from VO to entity (id属性不更新)
model.setName(vo.getName());
model.setCode(vo.getCode());
model.setType(vo.getType());
}
}

69
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorEntityService.java vendored
View File

@@ -2,7 +2,6 @@ package com.ecep.contract.ds.vendor.service;
import java.util.List;
import com.ecep.contract.QueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -16,16 +15,22 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.vendor.repository.VendorEntityRepository;
import com.ecep.contract.model.Vendor;
import com.ecep.contract.model.VendorEntity;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorEntityVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "company-vendor-entity")
public class VendorEntityService implements IEntityService<VendorEntity>, QueryService<VendorEntity> {
public class VendorEntityService implements IEntityService<VendorEntity>, QueryService<VendorEntity>,
VoableService<VendorEntity, VendorEntityVo> {
@Lazy
@Autowired
private VendorEntityRepository repository;
@@ -60,8 +65,7 @@ public class VendorEntityService implements IEntityService<VendorEntity>, QueryS
return builder.or(
builder.like(root.get("name"), "%" + searchText + "%"),
builder.like(root.get("abbName"), "%" + searchText + "%"),
builder.like(root.get("code"), "%" + searchText + "%")
);
builder.like(root.get("code"), "%" + searchText + "%"));
};
}
@@ -87,23 +91,19 @@ public class VendorEntityService implements IEntityService<VendorEntity>, QueryS
return findAll(spec, pageable);
}
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
})
@Override
public void delete(VendorEntity entity) {
repository.delete(entity);
}
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'code-'+#p0.code")
})
@Override
public VendorEntity save(VendorEntity entity) {
return repository.save(entity);
@@ -112,4 +112,41 @@ public class VendorEntityService implements IEntityService<VendorEntity>, QueryS
public List<VendorEntity> findAllByVendor(Vendor vendor) {
return repository.findByVendor(vendor);
}
@Override
public void updateByVo(VendorEntity model, VendorEntityVo vo) {
// 处理关联对象
if (vo.getVendorId() == null) {
model.setVendor(null);
} else {
model.setVendor(SpringApp.getBean(VendorService.class).findById(vo.getVendorId()));
}
// 更新基本属性
model.setName(vo.getName());
model.setAbbName(vo.getAbbName());
model.setCode(vo.getCode());
model.setModifyDate(vo.getModifyDate());
model.setDevelopDate(vo.getDevelopDate());
model.setUpdatedDate(vo.getUpdatedDate());
model.setFetchedTime(vo.getFetchedTime());
if (vo.getCatalogId() == null) {
model.setCatalog(null);
} else {
model.setCatalog(SpringApp.getBean(VendorCatalogService.class).findById(vo.getCatalogId()));
}
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
if (vo.getCreatorId() == null) {
model.setCreator(null);
} else {
model.setCreator(employeeService.findById(vo.getCreatorId()));
}
if (vo.getModifierId() == null) {
model.setModifier(null);
} else {
model.setModifier(employeeService.findById(vo.getModifierId()));
}
}
}

52
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java vendored
View File

@@ -6,9 +6,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.function.Consumer;
import com.ecep.contract.*;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,19 +16,29 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.ds.company.service.CompanyBasicService;
import com.ecep.contract.ds.contract.service.ContractFileService;
import com.ecep.contract.ds.contract.service.ContractService;
import com.ecep.contract.ds.vendor.repository.VendorFileRepository;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.Vendor;
import com.ecep.contract.model.VendorFile;
import com.ecep.contract.model.Contract;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorFileVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
public class VendorFileService implements IEntityService<VendorFile>, QueryService<VendorFile> {
public class VendorFileService
implements IEntityService<VendorFile>, QueryService<VendorFile>, VoableService<VendorFile, VendorFileVo> {
private static final Logger logger = LoggerFactory.getLogger(VendorFileService.class);
@@ -103,9 +110,9 @@ public class VendorFileService implements IEntityService<VendorFile>, QueryServi
/**
* 验证供应商文件
*
* @param vendor 供应商
* @param verifyDate 验证日期
* @param holder 状态输出
* @param vendor 供应商
* @param verifyDate 验证日期
* @param holder 状态输出
*/
public void verify(Vendor vendor, LocalDate verifyDate, MessageHolder holder) {
// 验证最早日期，之前属于历史问题，不做处理
@@ -207,5 +214,30 @@ public class VendorFileService implements IEntityService<VendorFile>, QueryServi
return CompanyBasicService.adjustToWorkDay(setupDate.plusDays(-7));
}
@Override
public void updateByVo(VendorFile model, VendorFileVo vo) {
if (model == null) {
throw new ServiceException("VendorFile cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorFileVo cannot be null");
}
// Map properties from VO to entity
model.setType(vo.getType());
model.setFilePath(vo.getFilePath());
model.setEditFilePath(vo.getEditFilePath());
model.setSignDate(vo.getSignDate());
model.setValid(vo.isValid());
if (vo.getVendorId() == null) {
model.setVendor(null);
} else {
VendorService vendorService = SpringApp.getBean(VendorService.class);
model.setVendor(vendorService.findById(vo.getVendorId()));
}
}
}

34
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileTypeService.java vendored
View File

@@ -3,7 +3,6 @@ package com.ecep.contract.ds.vendor.service;
import java.util.Locale;
import java.util.Map;
import com.ecep.contract.VendorType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -19,10 +18,14 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.VendorType;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.vendor.repository.VendorFileTypeLocalRepository;
import com.ecep.contract.model.VendorFileTypeLocal;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorFileTypeLocalVo;
import com.fasterxml.jackson.databind.JsonNode;
/**
@@ -32,7 +35,8 @@ import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "vendor-file-type")
public class VendorFileTypeService implements IEntityService<VendorFileTypeLocal>, QueryService<VendorFileTypeLocal> {
public class VendorFileTypeService implements IEntityService<VendorFileTypeLocal>, QueryService<VendorFileTypeLocal>,
VoableService<VendorFileTypeLocal, VendorFileTypeLocalVo> {
@Lazy
@Autowired
private VendorFileTypeLocalRepository repository;
@@ -45,7 +49,8 @@ public class VendorFileTypeService implements IEntityService<VendorFileTypeLocal
}
if (paramsNode.has("type")) {
spec = SpecificationUtils.and(spec, (root, query, builder) -> builder.equal(root.get("type"), VendorType.valueOf(paramsNode.get("type").asText())));
spec = SpecificationUtils.and(spec, (root, query, builder) -> builder.equal(root.get("type"),
VendorType.valueOf(paramsNode.get("type").asText())));
}
// field
@@ -76,10 +81,10 @@ public class VendorFileTypeService implements IEntityService<VendorFileTypeLocal
}
return (root, query, builder) -> {
return
// builder.or(
builder.like(root.get("type"), "%" + searchText + "%")
// )
;
// builder.or(
builder.like(root.get("type"), "%" + searchText + "%")
// )
;
};
}
@@ -100,4 +105,19 @@ public class VendorFileTypeService implements IEntityService<VendorFileTypeLocal
public VendorFileTypeLocal save(VendorFileTypeLocal entity) {
return repository.save(entity);
}
@Override
public void updateByVo(VendorFileTypeLocal entity, VendorFileTypeLocalVo vo) throws ServiceException {
if (entity == null) {
throw new ServiceException("VendorFileTypeLocal entity cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorFileTypeLocalVo cannot be null");
}
// 映射基本属性
entity.setLang(vo.getLang());
entity.setValue(vo.getValue());
entity.setType(vo.getType());
}
}

59
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorGroupRequireFileTypeService.java vendored
View File

@@ -2,9 +2,6 @@ package com.ecep.contract.ds.vendor.service;
import java.util.List;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.fasterxml.jackson.databind.JsonNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -16,13 +13,23 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.vendor.repository.VendorGroupRequireFileTypeRepository;
import com.ecep.contract.model.VendorGroup;
import com.ecep.contract.model.VendorGroupRequireFileType;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.vo.VendorGroupRequireFileTypeVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "vendor-group-require-file-type")
public class VendorGroupRequireFileTypeService implements IEntityService<VendorGroupRequireFileType>, QueryService<VendorGroupRequireFileType> {
public class VendorGroupRequireFileTypeService
implements IEntityService<VendorGroupRequireFileType>, QueryService<VendorGroupRequireFileType>,
VoableService<VendorGroupRequireFileType, VendorGroupRequireFileTypeVo> {
@Lazy
@Autowired
private VendorGroupRequireFileTypeRepository repository;
@@ -64,13 +71,11 @@ public class VendorGroupRequireFileTypeService implements IEntityService<VendorG
}
// save
@Caching(
evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'byGroup-'+#p0.group.id"),
@CacheEvict(key = "'all'")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"),
@CacheEvict(key = "'byGroup-'+#p0.group.id"),
@CacheEvict(key = "'all'")
})
public VendorGroupRequireFileType save(VendorGroupRequireFileType type) {
return repository.save(type);
}
@@ -78,15 +83,35 @@ public class VendorGroupRequireFileTypeService implements IEntityService<VendorG
/**
* delete and evict cache
*/
@Caching(
evict = {
@CacheEvict(key = "#p0.id"), @CacheEvict(key = "'byGroup-'+#p0.group.id"),
@CacheEvict(key = "'all'")
}
)
@Caching(evict = {
@CacheEvict(key = "#p0.id"), @CacheEvict(key = "'byGroup-'+#p0.group.id"),
@CacheEvict(key = "'all'")
})
public void delete(VendorGroupRequireFileType type) {
repository.delete(type);
}
@Override
public void updateByVo(VendorGroupRequireFileType entity, VendorGroupRequireFileTypeVo vo) throws ServiceException {
if (entity == null) {
throw new ServiceException("VendorGroupRequireFileType entity cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorGroupRequireFileTypeVo cannot be null");
}
// 映射基本属性
entity.setId(vo.getId());
entity.setFileType(vo.getFileType());
entity.setFrequency(vo.getFrequency());
// 处理关联实体
if (vo.getGroupId() != null) {
VendorGroupService vendorGroupService = SpringApp.getBean(VendorGroupService.class);
VendorGroup vendorGroup = vendorGroupService.findById(vo.getGroupId());
if (vendorGroup != null) {
entity.setGroup(vendorGroup);
}
}
}
}

39
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorGroupService.java vendored
View File

@@ -1,11 +1,7 @@
package com.ecep.contract.ds.vendor.service;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.vendor.repository.VendorGroupRepository;
import com.ecep.contract.model.VendorGroup;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -17,12 +13,21 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ecep.contract.IEntityService;
import com.ecep.contract.QueryService;
import com.ecep.contract.ds.vendor.repository.VendorGroupRepository;
import com.ecep.contract.model.VendorGroup;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorGroupVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "vendor-group")
public class VendorGroupService implements IEntityService<VendorGroup>, QueryService<VendorGroup> {
public class VendorGroupService
implements IEntityService<VendorGroup>, QueryService<VendorGroup>, VoableService<VendorGroup, VendorGroupVo> {
@Lazy
@Autowired
private VendorGroupRepository vendorGroupRepository;
@@ -96,4 +101,22 @@ public class VendorGroupService implements IEntityService<VendorGroup>, QuerySer
return group;
}
@Override
public void updateByVo(VendorGroup model, VendorGroupVo vo) {
if (model == null) {
throw new ServiceException("VendorGroup cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorGroupVo cannot be null");
}
// Map properties from VO to entity
model.setName(vo.getName());
model.setCode(vo.getCode());
model.setDescription(vo.getDescription());
model.setActive(vo.isActive());
model.setPriceComparison(vo.isPriceComparison());
model.setRequireQuotationSheetForBid(vo.isRequireQuotationSheetForBid());
model.setCanPrePurchase(vo.isCanPrePurchase());
}
}

20
server/src/main/java/com/ecep/contract/ds/vendor/service/VendorTypeService.java vendored
View File

@@ -21,13 +21,16 @@ import com.ecep.contract.VendorType;
import com.ecep.contract.constant.ServiceConstant;
import com.ecep.contract.ds.vendor.repository.VendorTypeLocalRepository;
import com.ecep.contract.model.VendorTypeLocal;
import com.ecep.contract.service.ServiceException;
import com.ecep.contract.service.VoableService;
import com.ecep.contract.util.SpecificationUtils;
import com.ecep.contract.vo.VendorTypeLocalVo;
import com.fasterxml.jackson.databind.JsonNode;
@Lazy
@Service
@CacheConfig(cacheNames = "vendor-type")
public class VendorTypeService implements IEntityService<VendorTypeLocal>, QueryService<VendorTypeLocal> {
public class VendorTypeService implements IEntityService<VendorTypeLocal>, QueryService<VendorTypeLocal>, VoableService<VendorTypeLocal, VendorTypeLocalVo> {
@Lazy
@Autowired
private VendorTypeLocalRepository repository;
@@ -95,4 +98,19 @@ public class VendorTypeService implements IEntityService<VendorTypeLocal>, Query
public VendorTypeLocal save(VendorTypeLocal entity) {
return repository.save(entity);
}
@Override
public void updateByVo(VendorTypeLocal entity, VendorTypeLocalVo vo) throws ServiceException {
if (entity == null) {
throw new ServiceException("VendorTypeLocal entity cannot be null");
}
if (vo == null) {
throw new ServiceException("VendorTypeLocalVo cannot be null");
}
// 映射基本属性
entity.setLang(vo.getLang());
entity.setType(vo.getType());
entity.setValue(vo.getValue());
}
}