diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 442315abf..525bf47ba 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -2650,9 +2650,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem returnMsgBody = processHistory.toString(); List progressList = processHistory.getHISTORY(); if (null != progressList && progressList.size() > 0) { - // 删除已有的<网格化平台处理记录> //22.9.22 之前是全删全中曾逻辑 现在不在删除历史数据 只是增加历史数据时间之后的新数据 - //this.removeOldHandleProcess(dto.getId()); // 保存新的处理记录 this.insertNewHandleProcess(progressList, dto.getReferenceId(), dto.getId()); // 查询最新处理情况 @@ -2710,7 +2708,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem wrapper.eq("created_by", "网格化平台"); wrapper.eq("del_flag", NumConstant.ZERO_STR); // 任何主动在流程表里插入的网格化操作都应该在过滤列表中,为了能够正常拉取网格化流程数据 - wrapper.notIn("state", ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); + wrapper.notIn("state", + ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(), + ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue(), + ItemHandleCategoryEnum.HANDLE_I_HANDLE_GOV_WHISTLE.getValue(), + ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue(), + ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_FK.getValue(), + ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); wrapper.orderByDesc("created_time"); wrapper.last("limit 1"); ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectOne(wrapper); @@ -3775,10 +3779,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setUpdatedTime(new Date()); itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto); - if(StringUtils.isNotBlank(firstHandleId)){ + if (StringUtils.isNotBlank(firstHandleId)) { // 插入第一级结案申请时的图片 List imageList = imgDao.selectListByRefeId(firstHandleId); - for(ImgEntity imgEntity : imageList){ + for (ImgEntity imgEntity : imageList) { imgEntity.setId(null); imgEntity.setReferenceId(itemHandleProcessDto.getId()); imgDao.insert(imgEntity); @@ -3893,7 +3897,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //入参集合为空或者集合里时间参数都为空时 if (params.isEmpty() || ( (!params.containsKey("startTime") || StringUtils.isEmpty(params.get("startTime").toString())) - && (!params.containsKey("endTime") || StringUtils.isEmpty(params.get("endTime").toString()))) + && (!params.containsKey("endTime") || StringUtils.isEmpty(params.get("endTime").toString()))) ) { DateTime dateTime = new DateTime(new Date()); Date d = dateTime.plusDays(-1).toDate(); @@ -3910,7 +3914,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 返回值 List resultList = new ArrayList(); - if("0".equals(formDTO.getIsElse())){ + if ("0".equals(formDTO.getIsElse())) { // 城市综合 // 定义初始【城市综合】5大类 List cityCompre = new ArrayList<>(); @@ -3923,12 +3927,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = baseDao.categoryAnalysisSecond(formDTO); // 其他总数 Integer elseValue = 0; - for(CategoryAnalysisPieResultDTO dto : list){ - if(cityCompre.contains(dto.getName())){ + for (CategoryAnalysisPieResultDTO dto : list) { + if (cityCompre.contains(dto.getName())) { String newName = dto.getName(); - dto.setName(newName.replace("城市综合-","")); + dto.setName(newName.replace("城市综合-", "")); resultList.add(dto); - }else{ + } else { elseValue += Integer.parseInt(dto.getValue()); } @@ -3940,20 +3944,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem elseCategory.setValue(elseValue.toString()); resultList.add(elseCategory); - }else{ + } else { // 其他 // 总数 Integer total = 0; List list = baseDao.categoryAnalysisFirst(formDTO); - for(CategoryAnalysisPieResultDTO dto1 : list){ + for (CategoryAnalysisPieResultDTO dto1 : list) { total += Integer.parseInt(dto1.getValue()); } - for(CategoryAnalysisPieResultDTO dto2 : list){ - if(!"城市综合".equals(dto2.getName())){ + for (CategoryAnalysisPieResultDTO dto2 : list) { + if (!"城市综合".equals(dto2.getName())) { BigDecimal value = BigDecimal.valueOf(Integer.parseInt(dto2.getValue())); BigDecimal totalBig = BigDecimal.valueOf(total); - BigDecimal proportion = value .divide(totalBig,2, RoundingMode.HALF_UP); + BigDecimal proportion = value.divide(totalBig, 2, RoundingMode.HALF_UP); dto2.setProportion(proportion + "%"); resultList.add(dto2);