java/zhihuishenqu.git

			@@ -499,6 +499,12 @@
			// 这里需要指定写用哪个class去写
			ExcelWriter excelWriter = null;
			InputStream inputStream = null;
			File file0=new File("d:/safetyWork/file");
			if(!file0.isDirectory()&&!file0.exists()){
			file0.mkdirs();
			}
			sftp.download("/mnt/data/web/", "安全工作记录.ftl", "d:/safetyWork/file/安全工作记录.ftl");
			sftp.download("/mnt/data/web/", "blank.jpg", "d:/safetyWork/file/blank.jpg");
			try {
			// 日期
			dataMap.put("date",
			@@ -506,13 +512,29 @@
			// 巡查类型
			dataMap.put("patrolType", comSwSafetyWorkRecordVO.getPatrolType());
			// 社区名称
			dataMap.put("communityName", comSwSafetyWorkRecordVO.getCommunityName());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getCommunityName())) {
			dataMap.put("communityName", comSwSafetyWorkRecordVO.getCommunityName());
			}else {
			dataMap.put("communityName", "");
			}
			// 地址
			dataMap.put("address", comSwSafetyWorkRecordVO.getAddress());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getAddress())) {
			dataMap.put("address", comSwSafetyWorkRecordVO.getAddress());
			}else {
			dataMap.put("address", "");
			}
			// 记录内容
			dataMap.put("recordContent", comSwSafetyWorkRecordVO.getRecordContent());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRecordContent())) {
			dataMap.put("recordContent", comSwSafetyWorkRecordVO.getRecordContent());
			}else {
			dataMap.put("recordContent", "");
			}
			// 发现记录
			dataMap.put("findRecord", comSwSafetyWorkRecordVO.getFindRecord());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getFindRecord())) {
			dataMap.put("findRecord", comSwSafetyWorkRecordVO.getFindRecord());
			}else {
			dataMap.put("findRecord", "");
			}
			// 记录照片
			List<String> photo = new ArrayList<>();
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRecordPhoto())) {
			@@ -522,112 +544,124 @@
			if (photo.size() == 1) {
			for (int i = 0; i < 9; i++) {
			if (i < 1) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 2) {
			for (int i = 0; i < 9; i++) {
			if (i < 2) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 3) {
			for (int i = 0; i < 9; i++) {
			if (i < 3) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 4) {
			for (int i = 0; i < 9; i++) {
			if (i < 4) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 5) {
			for (int i = 0; i < 9; i++) {
			if (i < 5) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 6) {
			for (int i = 0; i < 9; i++) {
			if (i < 6) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 7) {
			for (int i = 0; i < 9; i++) {
			if (i < 7) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 8) {
			for (int i = 0; i < 9; i++) {
			if (i < 8) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 9) {
			for (int i = 0; i < 9; i++) {
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
			}
			}
			} else {
			for (int i = 0; i < 9; i++) {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
			}
			}
			// 备注
			dataMap.put("remark", comSwSafetyWorkRecordVO.getRemark());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRemark())) {
			dataMap.put("remark", comSwSafetyWorkRecordVO.getRemark());
			}else {
			dataMap.put("remark", "");
			}
			// 巡查时间
			dataMap.put("patrolTime",
			new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
			// 工作人员
			dataMap.put("personName", comSwSafetyWorkRecordVO.getPersonName());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPersonName())) {
			dataMap.put("personName", comSwSafetyWorkRecordVO.getPersonName());
			}else {
			dataMap.put("personName", "");
			}
			// 填报人员
			dataMap.put("createName", comSwSafetyWorkRecordVO.getCreateName());
			if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getCreateName())) {
			dataMap.put("createName", comSwSafetyWorkRecordVO.getCreateName());
			}else {
			dataMap.put("createName", "");
			}
			// 填报时间
			dataMap.put("createAt",
			new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getCreateAt()));
			@@ -662,7 +696,7 @@
			// configuration.setClassForTemplateLoading(this.getClass(), "");

			// 指定路径的第二种方式，我的路径是C：/a.ftl
			configuration.setDirectoryForTemplateLoading(new File("c:/"));
			configuration.setDirectoryForTemplateLoading(new File("d:/safetyWork/file/"));

			// 输出文档路径及名称
			// File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
			@@ -723,20 +757,42 @@
			// 这里需要指定写用哪个class去写
			ExcelWriter excelWriter = null;
			InputStream inputStream = null;
			File file0=new File("d:/patrolRecord/file");
			if(!file0.isDirectory()&&!file0.exists()){
			file0.mkdirs();
			}
			sftp.download("/mnt/data/web/", "巡查记录.ftl", "d:/patrolRecord/file/巡查记录.ftl");
			sftp.download("/mnt/data/web/", "blank.jpg", "d:/patrolRecord/file/blank.jpg");
			try {
			// 日期
			dataMap.put("date",
			new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
			// 巡查类型
			dataMap.put("patrolType", comSwPatrolRecordVO.getPatrolType());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getPatrolType())) {
			dataMap.put("patrolType", comSwPatrolRecordVO.getPatrolType());
			}else {
			dataMap.put("patrolType", "");
			}
			// 社区名称
			// dataMap.put("communityName", comSwPatrolRecordVO.getCommunityName());
			// 地址
			dataMap.put("address", comSwPatrolRecordVO.getAddress());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getAddress())) {
			dataMap.put("address", comSwPatrolRecordVO.getAddress());
			}else {
			dataMap.put("address", "");
			}
			// 记录内容
			dataMap.put("recordContent", comSwPatrolRecordVO.getRecordContent());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRecordContent())) {
			dataMap.put("recordContent", comSwPatrolRecordVO.getRecordContent());
			}else {
			dataMap.put("recordContent", "");
			}
			// 发现记录
			dataMap.put("findRecord", comSwPatrolRecordVO.getFindRecord());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getFindRecord())) {
			dataMap.put("findRecord", comSwPatrolRecordVO.getFindRecord());
			}else {
			dataMap.put("findRecord", "");
			}
			// 记录照片
			List<String> photo = new ArrayList<>();
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRecordPhoto())) {
			@@ -746,119 +802,135 @@
			if (photo.size() == 1) {
			for (int i = 0; i < 9; i++) {
			if (i < 1) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 2) {
			for (int i = 0; i < 9; i++) {
			if (i < 2) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 3) {
			for (int i = 0; i < 9; i++) {
			if (i < 3) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 4) {
			for (int i = 0; i < 9; i++) {
			if (i < 4) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 5) {
			for (int i = 0; i < 9; i++) {
			if (i < 5) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 6) {
			for (int i = 0; i < 9; i++) {
			if (i < 6) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 7) {
			for (int i = 0; i < 9; i++) {
			if (i < 7) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 8) {
			for (int i = 0; i < 9; i++) {
			if (i < 8) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 9) {
			for (int i = 0; i < 9; i++) {
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
			downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
			}
			}
			} else {
			for (int i = 0; i < 9; i++) {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
			}
			}
			// 备注
			dataMap.put("remark", comSwPatrolRecordVO.getRemark());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRemark())) {
			dataMap.put("remark", comSwPatrolRecordVO.getRemark());
			}else {
			dataMap.put("remark", "");
			}
			// 巡查时间
			// dataMap.put("patrolTime", new
			// SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
			// 工作人员
			// dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
			// 巡查人员
			dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getPersonName())) {
			dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
			}else {
			dataMap.put("personName", "");
			}
			// 接班时间
			dataMap.put("successionTime",
			new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getSuccessionTime()));
			// 接班人员
			dataMap.put("successionPerson", comSwPatrolRecordVO.getSuccessionPerson());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getSuccessionPerson())) {
			dataMap.put("successionPerson", comSwPatrolRecordVO.getSuccessionPerson());
			}else {
			dataMap.put("successionPerson", "");
			}
			// 填报人员
			dataMap.put("createName", comSwPatrolRecordVO.getCreateName());
			if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getCreateName())) {
			dataMap.put("createName", comSwPatrolRecordVO.getCreateName());
			}else {
			dataMap.put("createName", "");
			}
			// 填报时间
			dataMap.put("createAt",
			new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getCreateAt()));
			@@ -893,7 +965,7 @@
			// configuration.setClassForTemplateLoading(this.getClass(), "");

			// 指定路径的第二种方式，我的路径是C：/a.ftl
			configuration.setDirectoryForTemplateLoading(new File("c:/"));
			configuration.setDirectoryForTemplateLoading(new File("d:/patrolRecord/file/"));

			// 输出文档路径及名称
			// File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
			@@ -954,21 +1026,47 @@
			// 这里需要指定写用哪个class去写
			ExcelWriter excelWriter = null;
			InputStream inputStream = null;
			File file0=new File("d:/dangerReport/file");
			if(!file0.isDirectory()&&!file0.exists()){
			file0.mkdirs();
			}
			sftp.download("/mnt/data/web/", "隐患报告.ftl", "d:/dangerReport/file/隐患报告.ftl");
			sftp.download("/mnt/data/web/", "blank.jpg", "d:/dangerReport/file/blank.jpg");
			try {
			// 日期
			dataMap.put("date", comSwDangerReportVO.getCheckTime());
			// 巡查类型
			dataMap.put("patrolType", comSwDangerReportVO.getPatrolType());
			// 地址
			dataMap.put("address", comSwDangerReportVO.getAddress());
			if (StringUtils.isNotEmpty(comSwDangerReportVO.getAddress())) {
			dataMap.put("address", comSwDangerReportVO.getAddress());
			}else {
			dataMap.put("address", "");
			}
			// 隐患名称
			dataMap.put("dangerName", comSwDangerReportVO.getDangerName());
			if (StringUtils.isNotEmpty(comSwDangerReportVO.getDangerName())) {
			dataMap.put("dangerName", comSwDangerReportVO.getDangerName());
			}else {
			dataMap.put("dangerName", "");
			}
			// 排查时间
			dataMap.put("checkTime", comSwDangerReportVO.getCheckTime());
			if (StringUtils.isNotEmpty(comSwDangerReportVO.getCheckTime())) {
			dataMap.put("checkTime", comSwDangerReportVO.getCheckTime());
			}else {
			dataMap.put("checkTime", "");
			}
			// 排查人员
			dataMap.put("ppersonName", comSwDangerReportVO.getPPersonName());
			if (StringUtils.isNotEmpty(comSwDangerReportVO.getPPersonName())) {
			dataMap.put("ppersonName", comSwDangerReportVO.getPPersonName());
			}else {
			dataMap.put("ppersonName", "");
			}
			// 填报人员
			dataMap.put("createName", comSwDangerReportVO.getCreateName());
			if (StringUtils.isNotEmpty(comSwDangerReportVO.getCreateName())) {
			dataMap.put("createName", comSwDangerReportVO.getCreateName());
			}else {
			dataMap.put("createName", "");
			}
			// 填报时间
			dataMap.put("createAt",
			new SimpleDateFormat("yyyy-MM-dd").format(comSwDangerReportVO.getCreateAt()));
			@@ -1001,173 +1099,173 @@
			if (stepsPhoto.size() == 1) {
			for (int i = 0; i < 9; i++) {
			if (i < 1) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 1) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 2) {
			for (int i = 0; i < 9; i++) {
			if (i < 2) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 2) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 3) {
			for (int i = 0; i < 9; i++) {
			if (i < 3) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 3) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 4) {
			for (int i = 0; i < 9; i++) {
			if (i < 4) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 4) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 5) {
			for (int i = 0; i < 9; i++) {
			if (i < 5) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 5) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 6) {
			for (int i = 0; i < 9; i++) {
			if (i < 6) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 6) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 7) {
			for (int i = 0; i < 9; i++) {
			if (i < 7) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 7) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 8) {
			for (int i = 0; i < 9; i++) {
			if (i < 8) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			for (int i = 0; i < 9; i++) {
			if (i < 8) {
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (stepsPhoto.size() == 9) {
			for (int i = 0; i < 9; i++) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 19),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			}
			for (int i = 0; i < 9; i++) {
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
			downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 1),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
			}
			}
			} else {
			for (int i = 0; i < 9; i++) {
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			for (int i = 0; i < 9; i++) {
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			// 社区处理建议
			@@ -1215,101 +1313,101 @@
			if (photo.size() == 1) {
			for (int i = 0; i < 9; i++) {
			if (i < 1) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 2) {
			for (int i = 0; i < 9; i++) {
			if (i < 2) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 3) {
			for (int i = 0; i < 9; i++) {
			if (i < 3) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 4) {
			for (int i = 0; i < 9; i++) {
			if (i < 4) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 5) {
			for (int i = 0; i < 9; i++) {
			if (i < 5) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 6) {
			for (int i = 0; i < 9; i++) {
			if (i < 6) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 7) {
			for (int i = 0; i < 9; i++) {
			if (i < 7) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 8) {
			for (int i = 0; i < 9; i++) {
			if (i < 8) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			} else {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			}
			if (photo.size() == 9) {
			for (int i = 0; i < 9; i++) {
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
			downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
			dataMap.put("imgStr" + (i + 10),
			getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
			}
			}
			} else {
			for (int i = 0; i < 9; i++) {
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
			dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
			}
			}
			// 备注
			@@ -1362,7 +1460,7 @@
			// configuration.setClassForTemplateLoading(this.getClass(), "");

			// 指定路径的第二种方式，我的路径是C：/a.ftl
			configuration.setDirectoryForTemplateLoading(new File("c:/"));
			configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/"));

			// 输出文档路径及名称
			// File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
			@@ -1449,7 +1547,7 @@
			return encoder.encode(data);
			}

			public String downloadPicture(String urlString, String fileName) throws Exception {
			public String downloadPicture(String urlString, String fileName,String dir) throws Exception {
			// 构造URL
			URL url = new URL(urlString);
			// 打开连接
			@@ -1461,7 +1559,7 @@
			// 读取到的数据长度
			int len;
			// 输出的文件流
			String filename = "d:/" + fileName + ".jpg"; // 下载路径及下载图片名称
			String filename = dir + fileName + ".jpg"; // 下载路径及下载图片名称
			File file = new File(filename);
			FileOutputStream os = new FileOutputStream(file, true);
			// 开始读取

	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java	402 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -805,10 +805,4 @@
			public R villageStatistics(@RequestParam("communityId") Long communityId) {
			return comMngVillageService.villageStatistics(communityId);
			}

			@GetMapping("/my")
			public void add() {
			comMngPopulationService.addPopuCommunity();
			}

			}

			@@ -490,6 +490,4 @@
			R relationVillage(String name);

			R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);

			void addPopuCommunity();
			}

			@@ -6624,11 +6624,6 @@
			new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
			}

			@Override
			public void addPopuCommunity() {

			}

			private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
			mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));