fix//review/program-info

Author: leaviiiiing

approval-pojo/src/main/java/fun/sast/vo/ProgramInfoForReview.java

@@ -11,8 +11,9 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class ProgramInfoForReview {
-    private Integer memberNum;
+    private String teamName;
     private UserInfo captain;
+    private Integer memberNum;
     private JSONArray memberList;
     private List<Accessory> accessories;
     private List<Text> texts;

approval-server/src/main/java/fun/sast/mapper/ReviewMapper.java

@@ -28,4 +28,8 @@ public interface ReviewMapper extends BaseMapper<Review> {
     String getTeamName(@Param("comId") Integer comId, @Param("captainId") String captainId);
 
     String getCaptainName(@Param("code") String captainId);
+
+    String getCaptainIdByProId(Integer proId);
+
+    Integer getComIdByProId(Integer proId);
 }

approval-server/src/main/java/fun/sast/service/ReviewService.java

@@ -2,10 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import fun.sast.entity.Review;
+import fun.sast.vo.ProgramInfoForReview;
 
 
 public interface ReviewService extends IService<Review> {
 
-
+    public ProgramInfoForReview getProgramInfo(Integer proId);
     Integer reviewTotal(String code, Integer comId);
 }

approval-server/src/main/java/fun/sast/service/impl/ReviewServiceImpl.java

@@ -1,16 +1,23 @@
 package fun.sast.service.impl;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import fun.sast.entity.Review;
 import fun.sast.mapper.ReviewMapper;
 import fun.sast.service.ReviewService;
+import fun.sast.utils.FileUtil;
+import fun.sast.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, Review> implements ReviewService {
@@ -26,4 +33,43 @@ public Integer reviewTotal(String code, Integer comId) {
         Integer count = Math.toIntExact(reviewMapper.selectCount(wrapper));
         return count;
     }
+
+    @Override
+    public ProgramInfoForReview getProgramInfo(Integer proId) {
+        Integer comId = reviewMapper.getComIdByProId(proId);
+        String captainId = reviewMapper.getCaptainIdByProId(proId);
+        if (comId == null || captainId == null) {
+            return null;
+        }
+        //获取文字信息
+        List<Text> texts = new ArrayList<>();
+        String SContents = reviewMapper.getContents(comId, captainId);
+        if (SContents != null) {
+            List<Content> contents = JSON.parseArray(SContents).toJavaList(Content.class);
+            for (Content content : contents) {
+                if (!content.getIsFile()) {
+                    texts.add(new Text(content.getInput(), content.getContent()));
+                }
+            }
+        }
+        //获取附件
+        List<String> urls = reviewMapper.getAccessories(comId, captainId);
+        List<Accessory> accessories = new ArrayList<>();
+        if (urls != null) {
+            for (Object url : urls) {
+                String sUrl = url.toString();
+                accessories.add(new Accessory(FileUtil.getFileName(sUrl), sUrl));
+            }
+        }
+        String teamName = reviewMapper.getTeamName(comId, captainId);
+        //成员信息
+        String jMembers = reviewMapper.getJMember(comId, captainId);
+        //获取成员数量
+        JSONArray array = JSON.parseArray(jMembers);
+        Integer memberNum = array.size();
+
+        //包装返回
+        return new ProgramInfoForReview(teamName,new UserInfo(captainId, reviewMapper.getCaptainName(captainId)) , memberNum, array, accessories, texts);
+    }
+
 }

approval-server/src/main/resources/mapper/ReviewMapper.xml

@@ -91,4 +91,16 @@
         WHERE code = #{code}
     </select>
 
+    <select id="getCaptainIdByProId" resultType="java.lang.String" parameterType="int">
+        SELECT user_code
+        FROM work
+        WHERE id = #{proId}
+    </select>
+
+    <select id="getComIdByProId" resultType="java.lang.Integer" parameterType="int">
+        SELECT com_id
+        FROM work
+        WHERE id = #{ProId}
+    </select>
+
 </mapper>