| 
					
				 | 
			
			
				@@ -1,19 +1,16 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package com.onemap.analyse.service.impl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.onemap.analyse.service.GdbhReportService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.analyse.service.ILogService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.analyse.service.QytdzzReportService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.analyse.utils.NpoiHelper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.common.core.utils.DateUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.common.core.utils.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.common.core.web.domain.RequestResult; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.onemap.system.api.ApplyService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.system.api.SpatialService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.onemap.system.api.domain.WktsVo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.commons.io.FileUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.poi.openxml4j.exceptions.InvalidFormatException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.poi.util.Units; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import org.apache.poi.xwpf.usermodel.ParagraphAlignment; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.poi.xwpf.usermodel.XWPFDocument; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.poi.xwpf.usermodel.XWPFRun; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Value; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -34,17 +31,15 @@ public class QytdzzReportServiceImpl implements QytdzzReportService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private String temp; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private ILogService iLogService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private ApplyService applyService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public String QytdzzCenerateDocx(Map<String, Object> qytuzzJgMap) throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Map<String, Object> yjjg = (Map) qytuzzJgMap.get("YJJG"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Map<String, Object> yjjg = (Map<String, Object>) qytuzzJgMap.get("YJJG"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String bsm = (String) yjjg.get("bsm"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         iLogService.saveLog(bsm, "整治预判分析", "整治预判分析中生成报告开始。。。", "info"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 文件硬盘真实路径 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String timeStamp = DateUtils.dateTimeNow() + ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        String timeStamp = DateUtils.dateTimeNow() ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String tempPath = temp; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String rootPath = File.separator + "整治预判分析报告" + File.separator + bsm; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String docxName = "整治预判分析报告_" + timeStamp + ".docx"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -69,7 +64,7 @@ public class QytdzzReportServiceImpl implements QytdzzReportService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String bsm = (String) yjjg.get("bsm"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String xmmc = (String) yjjg.get("xmmc"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Integer sumNumber = (Integer) yjjg.get("sumNumber"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        Integer sumNumber = (Integer) yjjg.get("sumNumber"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Double xzmj = (Double) yjjg.get("xzmj"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String ewkt = (String) yjjg.get("geom"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         XWPFDocument document = null; 
			 |