文档列表

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -139,8 +139,5 @@ public class CompanyController {
         msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
         return msg;
     }
-
-
-
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldFileController.java

@@ -12,17 +12,19 @@ import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.Map;
 
 /**
  * <p>
@@ -160,7 +162,7 @@ public class MouldFileController {
 
 //    @RequestMapping(value = "xxx/xxx",method = RequestMethod.POST)
 //    @ResponseBody
-//    public Map<String,Object> feedBackDirectMultiDownload(HttpServletRequest request,HttpServletResponse response) throws IOException{
+//    public Map<String,Object> feedBackDirectMultiDownload(HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        //压缩文件初始设置
 //        String path="压缩文件想要放置的路径";
 //        base_name = "zip文件名";

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -48,6 +48,8 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     MouldMapper mouldMapper;
     @Resource
     ProjectUserMapper projectUserMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
 
     @Override
     public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, MultipartFile file2, String path) {
@@ -280,6 +282,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     proIds.add(projectUser.getProjectId());
                 }
             }
+            //充当审批人员参与的项目
+            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+            if (projectss.size() > 0) {
+                for (ProjectApprove projectUser : projectss) {
+                    proIds.add(projectUser.getProjectId());
+                }
+            }
             list = mouldFileMapper.getFileListByProjectId(userVO,proIds);
         }
         PageInfo<MouldFileVO> pageInfos = new PageInfo<>(list);

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -388,6 +388,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             set.add(projectUser.getProjectId());
                         }
                     }
+//                //充当审批人员参与的项目
+                    List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+                    if (projectss.size() > 0) {
+                        for (ProjectApprove projectUser : projectss) {
+                            set.add(projectUser.getProjectId());
+                        }
+                    }
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 }
             }

cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -53,9 +53,11 @@
         tb_project p
         left join tb_project_user pu
         on p.id = pu.project_id
+        left join tb_project_approve tpa
+        on tpa.project_id = p.id
         <where>
             <if test="currentUser.id != 1">
-                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id}
+                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id} OR tpa.approver_id = #{currentUser.id}
             </if>
             <if test="keyName != null and keyName != ''">
                 p.project_name like concat('%',#{keyName},'%')