Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

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

@@ -142,7 +142,7 @@ public class MouldController {
      * 需要保养的模具列表
      * 参数 token 用户凭证
      */
-    @ApiOperation("模具保养提醒")
+    @ApiOperation("需要保养的模具列表")
     @RequestMapping("/maintainMouldList")
     @ResponseBody
     public HttpRespMsg maintainMouldList(UserVO userVO) throws Exception {

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldMapper.java

@@ -26,4 +26,6 @@ public interface MouldMapper extends BaseMapper<Mould> {
     List<MouldVO> selectListByConditionByProject(@Param("userVO")UserVO userVO, @Param("list")List<Integer> set);
 
     MouldVO getDetailById(@Param("mouldVO")MouldVO mouldVO);
+
+    List<MouldVO> maintainMouldList(UserVO userVO);
 }

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

@@ -28,8 +28,6 @@ public interface MouldFileService extends IService<MouldFile> {
     HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO);
     HttpRespMsg delFile(MouldFile mouldFile);
     HttpRespMsg getListByUserAndProjectId(UserVO userVO, PageUtil page);
-
     HttpRespMsg dowloadFileList(UserVO userVO, HttpServletRequest request, HttpServletResponse response,String downloadPath) throws IOException;
-
     HttpRespMsg addPartFile(UserVO userVO, String path, MultipartFile[] files);
 }

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

@@ -379,7 +379,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     dir.mkdirs();
                 }
                 String fileName = "";
-                if (!file.isEmpty()) {
+//                if (!file.isEmpty()) {
                     fileName = file.getOriginalFilename();
                     String fileNamePrex = fileName.substring(0, fileName.lastIndexOf("."));
                     String[] split = fileNamePrex.split("\\+");
@@ -426,7 +426,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     dynamics.setOperatorName(user.getUsername());
                     dynamics.setMouldId(userVO.getMouldId());
                     mouldOperationDynamicsMapper.insert(dynamics);
-                }
+//                }
                 msg.data = partFile;
             }
         } else {

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

@@ -3,6 +3,8 @@ package com.hssx.cloudmodel.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
@@ -264,7 +266,53 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
 
     @Override
     public HttpRespMsg maintainMouldList(UserVO userVO) {
-        return null;
+        HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        List<Integer> set = new ArrayList<>();
+        set.add(-1);
+        List<MouldVO> moulds = new ArrayList<>();
+        if (currentUser.getId() != null) {
+            //资产方管理员，获取他公司下的所有模具
+             if (Constant.SYS_ID == userVO.getParentId()) {
+                moulds = mouldMapper.maintainMouldList(userVO);
+            } else {
+                //普通用户或者项目经理
+                //充当项目经理参与的项目
+                if (userVO.getProjectId() != -1) {
+                    set.add(userVO.getProjectId());
+                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
+                } else {
+                    QueryWrapper<Project> qw = new QueryWrapper<>();
+                    qw.eq("manager_id", userVO.getId());
+                    List<Project> projects = projectMapper.selectList(qw);
+                    if (projects.size() > 0) {
+                        for (Project project : projects) {
+                            set.add(project.getId());
+                        }
+                    }
+//                //充当普通人员参与的项目
+                    List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", userVO.getId()));
+                    if (projectUsers.size() > 0) {
+                        for (ProjectUser projectUser : projectUsers) {
+                            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);
+                }
+            }
+            PageInfo<MouldVO> pageInfo = new PageInfo<>(moulds);
+            msg.data = pageInfo;
+        } else {
+            msg.setError("用户不存在，或者未登录！");
+        }
+        return msg;
     }
 
     //告警模板推送通用接口