pdf

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntityEnclosureController.java

@@ -61,7 +61,7 @@ public class EntityEnclosureController {
 			} else {
 				return BaseResponse.errorMsg("登录信息失效");
 			}
-			if (!extName.equals(".pdf")) {
+			if (!extName.equals(".pdf") && (extName.equals(".xls") || extName.equals(".xlsx"))) {
 				String pdfPath = FastDFSUtils.conventAndUpload(file.getInputStream(), fileName);
 				map.put("pdfPath", pdfPath);
 			} else {
@@ -133,7 +133,7 @@ public class EntityEnclosureController {
 						mapSub.put("fileUrl", picUrl);
 						mapSub.put("fileName", fileName);
 						mapSub.put("extName", extName);
-						if (!extName.equals(".pdf")) {
+						if (!extName.equals(".pdf") && (extName.equals(".xls") || extName.equals(".xlsx"))) {
 							String pdfPath = FastDFSUtils.conventAndUpload(file.getInputStream(), fileName);
 							mapSub.put("pdfPath", pdfPath);
 						} else {

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

 package cn.wise.sc.cement.business.controller;
 
 import cn.wise.sc.cement.business.model.BaseResponse;
-import cn.wise.sc.cement.business.model.FileExt;
+import cn.wise.sc.cement.business.enumation.FileExt;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.*;
 import cn.wise.sc.cement.business.model.vo.EntrustVo;

cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java

@@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.EntityEnclosure;
 import cn.wise.sc.cement.business.model.BaseResponse;
-import cn.wise.sc.cement.business.model.FileExt;
+import cn.wise.sc.cement.business.enumation.FileExt;
 import cn.wise.sc.cement.business.model.IndustrialElementKey;
 import cn.wise.sc.cement.business.model.IndustrialReport;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -35,7 +35,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;

cement-business/src/main/java/cn/wise/sc/cement/business/model/FileExt.java → cement-business/src/main/java/cn/wise/sc/cement/business/enumation/FileExt.java

-package cn.wise.sc.cement.business.model;
+package cn.wise.sc.cement.business.enumation;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  * @description: 文件扩展名
  * @author: qh
  * @create: 2020-10-16 13:40
  **/
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum FileExt {
 
 	//office后缀名

cement-business/src/main/java/cn/wise/sc/cement/business/util/WordUtil.java

 package cn.wise.sc.cement.business.util;
 
-import cn.wise.sc.cement.business.model.FileExt;
+import cn.wise.sc.cement.business.enumation.FileExt;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;