hlf 1 рік тому
батько
коміт
6e0c3367aa

+ 2 - 3
ims-service/ims-eval/src/main/java/com/ims/eval/controller/NoticeManagementController.java

@@ -169,8 +169,7 @@ public class NoticeManagementController {
 					// 上传文件路径
 					String filePath = Path.getNoticePath();
 					// 上传并返回新文件名称
-					String fileName = null;
-					fileName = FileUploadUtil.upload(filePath, file);
+					String fileName = FileUploadUtil.upload(filePath, file);
 					fileNames.append(fileName).append(",");
 				}
 				String noticeAnnex = evaluationNotice.getNoticeAnnex() + "," + fileNames.toString().substring(0, fileNames.toString().length() - 1);
@@ -267,7 +266,7 @@ public class NoticeManagementController {
 	 */
 	@GetMapping(value = "/filePreview")
 	public R convertToHtml(@RequestParam("url") String url) {
-		String httpUrl = "http://192.168.2.14:8098/office/" + url;
+		String httpUrl = "http://192.168.2.10:8098/office/" + url;
 		return R.ok().data(httpUrl);
 	}
 }

+ 1 - 2
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationNoticeServiceImpl.java

@@ -41,8 +41,7 @@ public class EvaluationNoticeServiceImpl extends ServiceImpl<EvaluationNoticeMap
 				// 上传文件路径
 				String filePath = Path.getNoticePath();
 				// 上传并返回新文件名称
-				String fileName = null;
-				fileName = FileUploadUtil.upload(filePath, file);
+				String fileName = FileUploadUtil.upload(filePath, file);
 				fileNames.append(fileName).append(",");
 			}
 			str = fileNames.toString().substring(0, fileNames.toString().length() - 1);

+ 1 - 1
ims-service/ims-eval/src/main/java/com/ims/eval/util/ExcelUtils.java

@@ -205,7 +205,7 @@ public class ExcelUtils {
 
 		// 设置申报理由
 		Row declarationReasonRow = sheet.createRow(3);
-		declarationReasonRow.setHeightInPoints(Float.parseFloat("80"));
+		declarationReasonRow.setHeightInPoints(Float.parseFloat("120"));
 		CellStyle declarationReasonStyle = createDeclarationReasonStyle(workbook, sheet);
 		Cell declarationReasonCell = declarationReasonRow.createCell(0);
 		declarationReasonCell.setCellValue(declarationReason);