QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/SecondStage' into SecondStage

Browse Source
This commit is contained in:
梁琦涛
2024-10-11 15:32:27 +08:00
parent e31591c4c6 e73a23cfb7
commit 32f9f50e3f
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+20 -10
View File
@@ -1,6 +1,7 @@
package com.jero.modules.activiti.process.annualinit.service;
import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
@@ -36,9 +37,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -180,6 +179,7 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
Map<String, List<SysDepart>> sysDepartMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName));
Map<String, String> sysDepartPathMap = SysDepart.buildPaths(departList);
LinkedList<String> standardNumberList = new LinkedList<>();
for (int i = 0; i < excelList.size(); i++) {
StringBuilder msgSub = new StringBuilder();
ProcessAnnualInitLinkExcelVO excelVO = excelList.get(i);
@@ -192,15 +192,25 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
excelVO.setRevisionType(espRevisionTypeMap.get(revisionType));
}
String standardNumber = excelVO.getStandardNumber();
if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
if (ProcessAnnualInitCommon.REVISE.equals(excelVO.getRevisionType())){
if (StringUtils.isBlank(standardNumber)){
msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
}
LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
if (lawsEnterpriseStandard != null){
excelVO.setStandardId(lawsEnterpriseStandard.getId());
}else {
msgSub.append("第" + (i + 4) + "行" + "企标编号不存在;");
}else
if (standardNumberList.contains(standardNumber)) {
msgSub.append("第" + (i + 4) + "行" + "企标编号重复;");
} else {
standardNumberList.add(standardNumber);
LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
if (lawsEnterpriseStandard != null){
excelVO.setStandardId(lawsEnterpriseStandard.getId());
//使用当前年份的年代号
String[] split = standardNumber.split("-");
split[split.length-1] = String.valueOf(DateUtil.thisYear());
String join = String.join("-", Arrays.asList(split));
excelVO.setStandardNumber(join);
}else {
msgSub.append("第" + (i + 4) + "行" + "企标编号不存在;");
}
}
}
String standardName = excelVO.getStandardName();