diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java index a4a575dc..51314a16 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java @@ -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> sysDepartMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName)); Map sysDepartPathMap = SysDepart.buildPaths(departList); + LinkedList 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