Merge remote-tracking branch 'origin/master'

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java

@@ -30,6 +30,9 @@ import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.imageio.ImageIO;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,7 +56,7 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
 
     }
 
-    public void saveFile(String sid, List<String> files, String attachType) {
+    public void saveFile(String sid, List<String> files, String attachType,String fileType) {
         List<OaAppendix> oaAppendixList = new ArrayList<>();
         if (!files.isEmpty()) {
             for (String file : files) {
@@ -62,6 +65,20 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
                 oaAppendix.setLinkSid(sid);
                 oaAppendix.setAttachType(attachType);
                 oaAppendix.setFilePath(filePath);
+               /* File filess = new File(fileUploadComponent.getUploadPath() + file.replace("/", File.separator));
+                if (file != null) {
+                    try {
+                        boolean isTrue = ImageIO.read(filess) != null;
+                        if (isTrue) {
+                            oaAppendix.setFileType("图片");
+                        } else {
+                            oaAppendix.setFileType("文件");
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }*/
+                oaAppendix.setFileType(fileType);
                 oaAppendixList.add(oaAppendix);
             }
         }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.oa.biz.oaform;
 
+import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,8 +10,9 @@ import lombok.Data;
  * @date: 2025/1/7
  **/
 @Data
-public class OaFormVo {
+public class OaFormVo implements Vo {
 
+    private static final long serialVersionUID = -3342916481276320884L;
     private String sid;
 
     @ApiModelProperty("创建人")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java

@@ -63,6 +63,6 @@ public class OaMendApplyDto extends OaFormDto {
     private String time;
     @ApiModelProperty("关联审批单")
     private String linkFormSids;
-    @ApiModelProperty("图片")
+    @ApiModelProperty("附件")
     private List<String> files = new ArrayList<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

@@ -158,15 +158,15 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
             baseMapper.updateById(entity);
         }
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.OAMENDAPPLY.getAttachType());
+        saveFiles(sid, files, OaFileEnum.OAMENDAPPLY.getAttachType(),"图片");
 
         return rb.success().setData(sid);
     }
 
     // 保存文件
-    private void saveFiles(String sid, List<String> files, String attachType) {
+    private void saveFiles(String sid, List<String> files, String attachType,String fileType) {
         files.removeAll(Collections.singleton(null));
-        oaAppendixService.saveFile(sid, files, attachType);
+        oaAppendixService.saveFile(sid, files, attachType,fileType);
     }
 
     public OaMendApplyVo fetchDetailsVoBySid(String sid) {