src/main/java/com/whyc/service/ProductSoftwareApprovingService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ProductSoftwareService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetLinkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetMainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/service/ProductSoftwareApprovingService.java
@@ -1,10 +1,13 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.mapper.ProductSoftwareApprovingMapper; import com.whyc.pojo.ProductSoftwareApproving; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; @Service public class ProductSoftwareApprovingService { @@ -15,4 +18,14 @@ public void insert(ProductSoftwareApproving approving) { mapper.insert(approving); } public ProductSoftwareApproving getByMainId(Integer mainId) { QueryWrapper<ProductSoftwareApproving> query = Wrappers.query(); query.eq("main_id",mainId).last(" limit 1"); return mapper.selectOne(query); } public List<ProductSoftwareApproving> getAll() { return mapper.selectList(null); } } src/main/java/com/whyc/service/ProductSoftwareService.java
@@ -81,6 +81,14 @@ logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail); } public void insert(ProductSoftware productSoftware) { mapper.insert(productSoftware); } public List<ProductSoftware> getAll() { return mapper.selectList(null); } public static void main(String[] args) throws UnsupportedEncodingException { String softwareName="散装件.zip"; //ISO8859-1 UTF-8 src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -48,6 +48,12 @@ @Autowired private MaterialService cService; @Autowired private ProductSoftwareApprovingService productSoftwareApprovingService; @Autowired private ProductSoftwareService productSoftwareService; @Transactional public void audit(WorksheetLink link) { link.setDealTime(new Date()); @@ -441,8 +447,17 @@ //List<ProductBomHistory> newBomList = historyService.getListByParentModel(cpAList.get(0).getParentModel(), nextVersion); //bomService.updateNewBom(newBomList); } else if(type.intValue() == EnumWorksheetType.ProductSoftware.getType()){ //转移记录 else if(type.intValue() == EnumWorksheetType.ProductSoftware.getType()){ //软件下载 //转移记录到正式表 ProductSoftwareApproving productSoftwareApproving = productSoftwareApprovingService.getByMainId(link.getMainId()); ProductSoftware productSoftware = new ProductSoftware(); productSoftware.setParentModel(productSoftwareApproving.getParentModel()); productSoftware.setSoftwareName(productSoftwareApproving.getSoftwareName()); productSoftware.setSoftwareUrl(productSoftwareApproving.getSoftwareUrl()); productSoftware.setSubmitTime(productSoftwareApproving.getCreateTime()); productSoftware.setCreateTime(new Date()); productSoftwareService.insert(productSoftware); } } } src/main/java/com/whyc/service/WorksheetMainService.java
@@ -65,6 +65,9 @@ @Autowired private ProductSoftwareApprovingService psaService; @Autowired private ProductSoftwareService productSoftwareService; @Transactional public boolean submit(WorksheetMain main, DocUser user) { main.setType(1); @@ -363,6 +366,23 @@ Response response = new Response(); WorksheetMain main = mainDTO.getMain(); ProductSoftwareApproving approving = mainDTO.getApproving(); //首先校验文件名是否已存在 String filename = file.getOriginalFilename(); List<ProductSoftwareApproving> softwareApprovingList = psaService.getAll(); List<ProductSoftware> softwareList = productSoftwareService.getAll(); List<String> existApprovingList = softwareApprovingList.stream().map(ProductSoftwareApproving::getSoftwareName).collect(Collectors.toList()); List<String> existList = softwareList.stream().map(ProductSoftware::getSoftwareName).collect(Collectors.toList()); for (String existFilename:existList){ if(filename.equals(existFilename)){ return response.set(1,false,"软件文件名已存在"); } } for (String existFilename:existApprovingList){ if(filename.equals(existFilename)){ return response.set(1,false,"软件文件名在审批列表中已存在"); } } main.setType(1); //提交主表