diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/mapper/TSTaskListMapper.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/mapper/TSTaskListMapper.java index cb4f156..e23deb0 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/mapper/TSTaskListMapper.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/mapper/TSTaskListMapper.java @@ -102,6 +102,13 @@ public interface TSTaskListMapper extends BaseMapper { */ IPage selectFinishUnionTaskPage(IPage page, @Param("taskList") TaskListUnionDto taskListUnionParam, @Param("customParamMap") Map customParamMap); + /** + * 查询执行中的用户id + * @param workFlowId 工作流id + * @return 执行中的用户 + */ + TaskListUnionDto selectCurrentExecUserInfo(@Param("workFlowId") String workFlowId); + List searchUnionTaskList(@Param("bustype") String yclrStr, @Param("userId") String userId); List searchUnionTaskToday(@Param("userId") String userId); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java index fd68e83..8e0cc1e 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java @@ -39,17 +39,19 @@ import com.chinaweal.aiccs.door.service.ITUserportalService; import com.chinaweal.aiccs.org.entity.OrgUnits; import com.chinaweal.aiccs.org.mapper.AicorgMapper; import com.chinaweal.aiccs.org.mapper.TUsersMapper; -import com.chinaweal.aiccs.org.service.AicorgService; import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.stream.Collectors; /** @@ -103,6 +105,8 @@ public class TSTaskListServiceImpl extends BaseServiceImpl searchFinishTaskUnionPage(IPage page, TaskListUnionDto taskListUnionParam, Map customParamMap) { - return baseMapper.selectFinishUnionTaskPage(page, taskListUnionParam, customParamMap); + IPage taskListUnionDtoIPage = baseMapper.selectFinishUnionTaskPage(page, taskListUnionParam, customParamMap); + List> futureList = new ArrayList<>(); + for (TaskListUnionDto each : taskListUnionDtoIPage.getRecords()) { + futureList.add(threadPoolTaskExecutor.submit(() -> { + TaskListUnionDto taskListUnionDto = baseMapper.selectCurrentExecUserInfo(each.getWorkflowid()); + each.setCurruserid(taskListUnionDto.getCurruserid()); + each.setCurrusername(taskListUnionDto.getCurrusername()); + each.setOrgunitid(taskListUnionDto.getOrgunitid()); + each.setOrgunitname(taskListUnionDto.getOrgunitname()); + })); + } + for (Future each : futureList) { + try { + each.get(); + } catch (InterruptedException | ExecutionException e) { + } + } + return taskListUnionDtoIPage; } @Override @@ -385,16 +406,16 @@ public class TSTaskListServiceImpl extends BaseServiceImpl eBaseinfoList = eBaseinfoService.list(wrapper); if (eBaseinfoList != null && eBaseinfoList.size() > 0) { - for(EBaseinfo eBaseinfo : eBaseinfoList){ + for (EBaseinfo eBaseinfo : eBaseinfoList) { List busQueryConditionByPripid = baseMapper.getBusQueryConditionByPripid(eBaseinfo.getPripid()); - if(busQueryConditionByPripid != null){ + if (busQueryConditionByPripid != null) { bizSeqList.addAll(busQueryConditionByPripid); } } paramMap.put("pripid", "pripid"); paramMap.remove("searchName"); - if (bizSeqList == null || bizSeqList.size() == 0 ) { + if (bizSeqList == null || bizSeqList.size() == 0) { return null; } } else { @@ -448,7 +469,7 @@ public class TSTaskListServiceImpl extends BaseServiceImpl queryAbnList(Page page, Map paramMap) { - String searchUscc=StringUtils.tranObject(paramMap.get("searchUscc")); + String searchUscc = StringUtils.tranObject(paramMap.get("searchUscc")); if (StringUtils.isNotBlank(searchUscc)) { if (StringUtils.isUscc(searchUscc)) { paramMap.put("uniscid", searchUscc); @@ -472,7 +493,7 @@ public class TSTaskListServiceImpl extends BaseServiceImpl regulatory = (List) paramMap.get("regulatory"); - if(regulatory.size()>0) { + if (regulatory.size() > 0) { String suporg = regulatory.get(regulatory.size() - 1); List idsByParentId = areaSliceService.getIdsByParentId(suporg); //获取所有子片区id idsByParentId.add(suporg); //加上父id @@ -480,12 +501,12 @@ public class TSTaskListServiceImpl extends BaseServiceImpl data=null; + IPage data = null; data = baseMapper.queryAbnList(page, paramMap); //封装主体类型名称 data.getRecords().forEach(each -> { TREntPriseType type = entPriseTypeService.getEntPriseTypeFromCache(each.getEnttype()); - if(type != null){ + if (type != null) { each.setEnttypeCN(type.getDisplayvalue()); } }); @@ -493,8 +514,8 @@ public class TSTaskListServiceImpl extends BaseServiceImpl exportAbnList( Map paramMap) { - String searchUscc=StringUtils.tranObject(paramMap.get("searchUscc")); + public List exportAbnList(Map paramMap) { + String searchUscc = StringUtils.tranObject(paramMap.get("searchUscc")); if (StringUtils.isNotBlank(searchUscc)) { if (StringUtils.isUscc(searchUscc)) { paramMap.put("uniscid", searchUscc); @@ -518,7 +539,7 @@ public class TSTaskListServiceImpl extends BaseServiceImpl regulatory = (List) paramMap.get("regulatory"); - if(regulatory.size()>0) { + if (regulatory.size() > 0) { String suporg = regulatory.get(regulatory.size() - 1); List idsByParentId = areaSliceService.getIdsByParentId(suporg); //获取所有子片区id idsByParentId.add(suporg); //加上父id @@ -526,7 +547,7 @@ public class TSTaskListServiceImpl extends BaseServiceImpl data=null; + List data = null; data = baseMapper.exportAbnList(paramMap); return data; } @@ -565,14 +586,14 @@ public class TSTaskListServiceImpl extends BaseServiceImpl data=null; + IPage data = null; data = baseMapper.queryOldeBusness(page, paramMap); return data; } @Override public IPage repairTaskQuery(Page page, Map paramMap) { - boolean isGzrNum = paramMap.containsKey("gzrNumSwitch") && (boolean)paramMap.get("gzrNumSwitch"); + boolean isGzrNum = paramMap.containsKey("gzrNumSwitch") && (boolean) paramMap.get("gzrNumSwitch"); if (isGzrNum) { int gzrNum = (int) paramMap.get("gzrNum"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -592,7 +613,7 @@ public class TSTaskListServiceImpl extends BaseServiceImpl tsBizSerIllegalRemList = tsBizSerIllegalRemService.selectbizRembizseq(repairTaskListDto.getBizseqid()); @@ -621,7 +642,7 @@ public class TSTaskListServiceImpl extends BaseServiceImpl queryxyxfCqList(Page page, Map paramMap) { - String entType=StringUtils.tranObject(paramMap.get("entType")); + String entType = StringUtils.tranObject(paramMap.get("entType")); Object intoObj = paramMap.get("searchIntoDate"); @@ -631,10 +652,10 @@ public class TSTaskListServiceImpl extends BaseServiceImpl data=null; + IPage data = null; if ("0".equals(entType)) { data = tsBizRemListMapper.queryxyxfCqList(page, paramMap); - }else { + } else { data = tsBizRemListMapper.queryxyxfCqYzfwList(page, paramMap); } if (data != null) { @@ -646,13 +667,13 @@ public class TSTaskListServiceImpl extends BaseServiceImpl exportxyxfCqList(Map paramMap) { - String entType=StringUtils.tranObject(paramMap.get("entType")); + String entType = StringUtils.tranObject(paramMap.get("entType")); Object intoObj = paramMap.get("searchIntoDate"); @@ -673,10 +694,10 @@ public class TSTaskListServiceImpl extends BaseServiceImpl data=null; + List data = null; if ("0".equals(entType)) { data = tsBizRemListMapper.exportqueryxyxfCqList(paramMap); - }else { + } else { data = tsBizRemListMapper.exportqueryxyxfCqYzfwList(paramMap); } @@ -686,13 +707,13 @@ public class TSTaskListServiceImpl extends BaseServiceImpl repairTaskStatistic(Map paramMap,AICUser aicUser) { + public List repairTaskStatistic(Map paramMap, AICUser aicUser) { //判断有没有受理机关的条件 String orgNumber = (String) paramMap.get("orgNumber"); Map params = new HashMap<>(); params.put("deleted", "0"); params.put("unittype", "1"); - if(StringUtils.isEmpty(orgNumber)){ + if (StringUtils.isEmpty(orgNumber)) { params.put("orgNumber", aicUser.getRegionID()); OrgUnits org = aicorgMapper.queryByOrgNumberMap(params); Integer orgLevel = org.getOrgLevel(); //根据机构等级判断 if (orgLevel == 1) { //省局 - paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 2)+"%"); + paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 2) + "%"); } else if (orgLevel == 2) { //市局 - paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 4)+"%"); + paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 4) + "%"); } else if (orgLevel == 3) { //区局 - paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); + paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6) + "%"); } else if (orgLevel >= 4) { //所 - paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6)+"%"); + paramMap.put("areaCode", StringUtils.substring(aicUser.getRegionID(), 0, 6) + "%"); } } - boolean isGzrNum = paramMap.containsKey("gzrNumSwitch") && (boolean)paramMap.get("gzrNumSwitch"); + boolean isGzrNum = paramMap.containsKey("gzrNumSwitch") && (boolean) paramMap.get("gzrNumSwitch"); if (isGzrNum) { int gzrNum = (int) paramMap.get("gzrNum"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -743,25 +764,25 @@ public class TSTaskListServiceImpl extends BaseServiceImpl repairTaskStatisticDtos = baseMapper.repairTaskStatistic(paramMap); - for(RepairTaskStatisticDto dto : repairTaskStatisticDtos){ + for (RepairTaskStatisticDto dto : repairTaskStatisticDtos) { params.put("orgNumber", dto.getOrgNumber()); OrgUnits orgUnits = aicorgMapper.queryByOrgNumberMap(params); - dto.setOrgName(orgUnits==null?"":orgUnits.getOrgUnitName()); + dto.setOrgName(orgUnits == null ? "" : orgUnits.getOrgUnitName()); } return repairTaskStatisticDtos; } @Override - public Map indexPageStatistic(Map customParamMap,AICUser aicUser) { - Map map = new HashMap<>(); + public Map indexPageStatistic(Map customParamMap, AICUser aicUser) { + Map map = new HashMap<>(); customParamMap.put("areaCode", aicUser.getRegionID()); //统计信用修复正常、即将超期、超期的数量 Map repairStatistic = baseMapper.indexPageRepairStatistic(customParamMap); - map.put("repairStatistic",repairStatistic); + map.put("repairStatistic", repairStatistic); //统计经营异常主体类型分布 Map entTypeStatistic = baseMapper.tsAbnEntTypeStatistic(); - map.put("entTypeStatistic",entTypeStatistic); + map.put("entTypeStatistic", entTypeStatistic); //统计各地区经营异常主体数量 List orgList = aicorgMapper.selectList(new LambdaQueryWrapper() @@ -781,12 +802,12 @@ public class TSTaskListServiceImpl extends BaseServiceImpl AND n.status = '0' +