零件的添加与修改

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

@@ -57,15 +57,15 @@ public class MouldMaintainController {
 
     /**
      * 保养列表
-     * token 用户身份凭证,pageNum 当前页码，pageSize 每页条数
+     * token 用户身份凭证,pageNum 当前页码，pageSize 每页条数,mouldId 模具id
      * @return
      */
     @ApiOperation("保养列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg uploadFile(String token, PageUtil page) throws Exception {
+    public HttpRespMsg uploadFile(UserVO userVO, PageUtil page) throws Exception {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = mouldMaintainService.getList(token,page);
+        msg = mouldMaintainService.getList(userVO,page);
         return msg;
     }
 

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.MouldMaintain;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.vo.MouldVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.web.multipart.MultipartFile;
@@ -19,5 +20,5 @@ public interface MouldMaintainService extends IService<MouldMaintain> {
 
     HttpRespMsg addMaintain(MultipartFile file, String path, MouldMaintain mouldMaintain,String token);
 
-    HttpRespMsg getList(String token,PageUtil page);
+    HttpRespMsg getList(UserVO userVO, PageUtil page);
 }

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

@@ -7,6 +7,7 @@ import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.MouldFileVO;
 import com.hssx.cloudmodel.entity.vo.MouldVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.MouldMaintainService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -96,49 +97,51 @@ public class MouldMaintainServiceImpl extends ServiceImpl<MouldMaintainMapper, M
     }
 
     @Override
-    public HttpRespMsg getList(String token, PageUtil page) {
+    public HttpRespMsg getList(UserVO userVO, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
         List<Integer> proIds = new ArrayList<>();
-        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         List<MouldMaintain> mouldMaintains = new ArrayList<>();
         if (currentUser != null) {
-            //资产方管理员，获取他公司下的所有模具
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            if (Constant.SYS_ID == currentUser.getParentId()) {
-                QueryWrapper<Project> qw = new QueryWrapper<>();
-                List<Project> projects = projectMapper.selectList(qw.eq("creator_id", currentUser.getId()));
-                for (Project pro : projects) {
-                    proIds.add(pro.getId());
-                }
-                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
-            } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
-                //系统管理员
-                mouldMaintains = mouldMaintainMapper.selectList(new QueryWrapper<MouldMaintain>());
-            } else {
-                QueryWrapper<Project> qw = new QueryWrapper<>();
-                qw.eq("manager_id", currentUser.getId());
-                List<Project> projects = projectMapper.selectList(qw);
-                if (projects.size() > 0) {
-                    for (Project project : projects) {
-                        proIds.add(project.getId());
-                    }
-                }
-//                //充当普通人员参与的项目
-                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id",currentUser.getId()));
-                if (projectUsers.size() > 0) {
-                    for (ProjectUser projectUser : projectUsers) {
-                        proIds.add(projectUser.getProjectId());
-                    }
-                }
-                //充当审批人员参与的项目
-                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
-                if (projectss.size() > 0) {
-                    for (ProjectApprove projectUser : projectss) {
-                        proIds.add(projectUser.getProjectId());
-                    }
-                }
-                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
-            }
+            mouldMaintains = mouldMaintainMapper.selectList(new QueryWrapper<MouldMaintain>().eq("mould_id",userVO.getMouldId()));
+//            //资产方管理员，获取他公司下的所有模具
+//            PageHelper.startPage(page.getPageNum(), page.getPageSize());
+//            if (Constant.SYS_ID == currentUser.getParentId()) {
+//                QueryWrapper<Project> qw = new QueryWrapper<>();
+//                List<Project> projects = projectMapper.selectList(qw.eq("creator_id", currentUser.getId()));
+//                for (Project pro : projects) {
+//                    proIds.add(pro.getId());
+//                }
+//                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
+//            } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+//                //系统管理员
+//                mouldMaintains = mouldMaintainMapper.selectList(new QueryWrapper<MouldMaintain>());
+//            } else {
+//                QueryWrapper<Project> qw = new QueryWrapper<>();
+//                qw.eq("manager_id", currentUser.getId());
+//                List<Project> projects = projectMapper.selectList(qw);
+//                if (projects.size() > 0) {
+//                    for (Project project : projects) {
+//                        proIds.add(project.getId());
+//                    }
+//                }
+////                //充当普通人员参与的项目
+//                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id",currentUser.getId()));
+//                if (projectUsers.size() > 0) {
+//                    for (ProjectUser projectUser : projectUsers) {
+//                        proIds.add(projectUser.getProjectId());
+//                    }
+//                }
+//                //充当审批人员参与的项目
+//                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
+//                if (projectss.size() > 0) {
+//                    for (ProjectApprove projectUser : projectss) {
+//                        proIds.add(projectUser.getProjectId());
+//                    }
+//                }
+//                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
+//            }
             PageInfo<MouldMaintain> pageInfos = new PageInfo<>(mouldMaintains);
             msg.data = pageInfos;
         } else {