修改返回接口

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -20,17 +20,19 @@ import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
 import com.xjrsoft.module.material.dto.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.excel.EasyExcel;
-import com.xjrsoft.module.material.entity.MaterialTaskAssign;
-import com.xjrsoft.module.material.entity.MaterialType;
-import com.xjrsoft.module.material.entity.MaterialTypeAssign;
+import com.xjrsoft.module.material.entity.*;
+import com.xjrsoft.module.material.service.IMaterialTaskAppendixService;
 import com.xjrsoft.module.material.service.IMaterialTaskAssignService;
 import com.xjrsoft.module.material.vo.*;
+import com.xjrsoft.module.oa.entity.NewsAppendix;
 import com.xjrsoft.module.oa.entity.NewsRelation;
+import com.xjrsoft.module.oa.vo.NewsAppendixVo;
 import com.xjrsoft.module.oa.vo.NewsRelationVo;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.personnel.entity.FaceIdentifyRecords;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
@@ -39,7 +41,6 @@ import org.springframework.http.ResponseEntity;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 
-import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.service.IMaterialTaskService;
 
 import io.swagger.annotations.Api;
@@ -68,6 +69,7 @@ public class MaterialTaskController {
 
 
     private final IMaterialTaskAssignService materialTaskAssignService;
+    private  final IMaterialTaskAppendixService materialTaskAppendixService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "材料提交任务列表(分页 自己)")
@@ -130,7 +132,21 @@ public class MaterialTaskController {
         if (materialTask == null) {
             return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(materialTask, MaterialTaskVo.class));
+
+        MaterialTaskVo materialTaskVo = BeanUtil.toBean(materialTask, MaterialTaskVo.class);
+        List<MaterialTaskAppendixVo> newsAppendixVoList = materialTaskAppendixService.selectJoinList(MaterialTaskAppendixVo.class,
+                new MPJLambdaWrapper<MaterialTaskAppendix>().eq(MaterialTaskAppendix::getMaterialTaskId, id)
+                        .select(MaterialTaskAppendix::getId)
+                        .select(MaterialTaskAppendix.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAppendixVo.class).contains(x.getProperty()))
+                        .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId, ext -> ext.selectAs(File::getFileName, MaterialTaskAppendixVo::getFileName)
+                                .selectAs(File::getFolderId, MaterialTaskAppendixVo::getFolderId)
+                                .selectAs(File::getFileUrl, MaterialTaskAppendixVo::getFileUrl))
+        );
+
+        if (newsAppendixVoList.size() > 0) {
+            materialTaskVo.setMaterialTaskAppendixList(newsAppendixVoList);
+        }
+        return RT.ok(materialTaskVo);
     }
 
 

src/main/java/com/xjrsoft/module/material/service/IMaterialTaskAppendixService.java

@@ -0,0 +1,7 @@
+package com.xjrsoft.module.material.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+
+public interface IMaterialTaskAppendixService  extends MPJBaseService<MaterialTaskAppendix> {
+}

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskAppendixServiceImpl.java

@@ -0,0 +1,13 @@
+package com.xjrsoft.module.material.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
+import com.xjrsoft.module.material.mapper.MaterialTaskAppendixMapper;
+import com.xjrsoft.module.material.service.IMaterialTaskAppendixService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MaterialTaskAppendixServiceImpl   extends MPJBaseServiceImpl<MaterialTaskAppendixMapper, MaterialTaskAppendix> implements IMaterialTaskAppendixService {
+}

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskAppendixVo.java

@@ -32,7 +32,21 @@ public class MaterialTaskAppendixVo {
     */
     @ApiModelProperty("文件ID(xjr_file)")
     private Long fileId;
-
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty("文件名称")
+    private String fileName;
+    /**
+     * 附件夹主键
+     */
+    @ApiModelProperty("附件夹主键")
+    private Long folderId;
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty("文件路径")
+    private String fileUrl;
 
 
 }