| 
					
				 | 
			
			
				@@ -420,4 +420,70 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             demFireLabelAttributeService.delDemFireLabelAttribute(list.get(0).getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public CommonPage<Map<String, Object>> firePlaceList(String fireNumber, Integer id, Integer pageNum, Integer pageSize) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<Map<String, Object>> list = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        IPage<DemFireStatistics> page = new Page<>(pageNum, pageSize); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        queryWrapper.select(DemFireStatistics::getId, DemFireStatistics::getFireNumber, DemFireStatistics::getBurnedArea, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                DemFireStatistics::getFireTimeText, DemFireStatistics::getFireGrade) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(id != null && id != 0, DemFireStatistics::getId, id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .orderByDesc(DemFireStatistics::getId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        page = this.page(page, queryWrapper); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (CollectionUtils.isNotEmpty(page.getRecords())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<String> fireNumberList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (int i = 0; i < page.getRecords().size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                fireNumberList.add(page.getRecords().get(i).getFireNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            LambdaQueryWrapper<DemFireStatisticsAttach> queryWrapper1 = Wrappers.lambdaQuery(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            queryWrapper1.select(DemFireStatisticsAttach::getId, DemFireStatisticsAttach::getFireNumber, DemFireStatisticsAttach::getInitialFuelType1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getBuildName) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    .in(CollectionUtils.isNotEmpty(fireNumberList), DemFireStatisticsAttach::getFireNumber, fireNumberList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<DemFireStatisticsAttach> list1 = demFireStatisticsAttachService.list(queryWrapper1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (int i = 0; i < page.getRecords().size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Map<String, Object> map = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("id", page.getRecords().get(i).getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("fireNumber", page.getRecords().get(i).getFireNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("burnedArea", page.getRecords().get(i).getBurnedArea()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("affectedHouse", page.getRecords().get(i).getAffectedHouse()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("victimNumber", page.getRecords().get(i).getVictimNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("directPropertyLoss", page.getRecords().get(i).getDirectPropertyLoss()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("fireTimeText", page.getRecords().get(i).getFireTimeText()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("fireGrade", page.getRecords().get(i).getFireGrade()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("id1", 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("initialFuelType1", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("fireCauseType1", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                map.put("buildName", null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                for (int j = 0; j < list1.size(); j++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if (page.getRecords().get(i).getFireNumber().equals(list1.get(j).getFireNumber())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        map.put("id1", list1.get(j).getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        map.put("initialFuelType1", list1.get(j).getInitialFuelType1()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        map.put("fireCauseType1", list1.get(j).getFireCauseType1()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        map.put("buildName", list1.get(j).getBuildName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                list.add(map); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Transactional 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void updateFirePlace(DemFireStatistics demFireStatistics) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatistics.setUpdatePerson(SecurityUtils.getUsername()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatistics.setUpdateTime(LocalDateTime.now()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.updateById(demFireStatistics); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        DemFireStatisticsAttach demFireStatisticsAttach = new DemFireStatisticsAttach(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttach.setId(demFireStatistics.getId1()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttach.setInitialFuelType1(demFireStatistics.getInitialFuelType1()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttach.setFireCauseType1(demFireStatistics.getFireCauseType1()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttach.setBuildName(demFireStatistics.getBuildName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttach.setUpdatePerson(SecurityUtils.getUsername()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttach.setUpdateTime(LocalDateTime.now()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        demFireStatisticsAttachService.updateById(demFireStatisticsAttach); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |