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

@@ -87,6 +87,19 @@ public class MouldController {
         msg = projectService.getModelListByCompanyId(user);
         return msg;
     }
+    /**
+     * 给编辑项目时返回的项目里的模具和可供选择的模具
+     * projectId 项目id ,token 人员身份凭证
+     * @return
+     */
+    @ApiOperation("给编辑项目时返回的项目里的模具和可供选择的模具")
+    @RequestMapping("/chooseModelList")
+    @ResponseBody
+    public HttpRespMsg chooseModelList(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = projectService.getModelListByCompanyIdAndProjectId(userVO);
+        return msg;
+    }
 
     /**
      * 给项目分配模具获取该公司下的模具列表

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

@@ -29,7 +29,7 @@ public interface MouldMapper extends BaseMapper<Mould> {
 
     List<MouldVO> maintainMouldList(UserVO userVO);
 
-    List<MouldVO> selectListByCompanyId(@Param("companyId")Integer companyId);
+    List<MouldVO> selectListByCompanyId(@Param("companyId")Integer companyId,@Param("projectId")Integer projectId);
 
     void updateModelProjectIdAndEquipmentIdToNullById(@Param("model")Mould model);
 }

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

@@ -41,4 +41,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getProjectListByUserAndCompany(UserVO userVO);
 
     HttpRespMsg getModelListMapByUser(UserVO userVO);
+
+    HttpRespMsg getModelListByCompanyIdAndProjectId(UserVO userVO);
 }

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

@@ -521,7 +521,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 //            qw.eq("company_id", admin.getCompanyId());
         }
 //        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", companyId).isNull("project_id"));
-        msg.data = mouldMapper.selectListByCompanyId(companyId);
+        msg.data = mouldMapper.selectListByCompanyId(companyId,null);
         return msg;
     }
 
@@ -543,6 +543,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     moulds = mouldMapper.selectListByCondition(userVO);
                 } else if (Constant.PRODUCER_COMPANY == userVO.getSubordinateType()) {
                     set = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", userVO.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
+                    set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 }
             } else {
@@ -550,6 +551,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //充当项目经理参与的项目
                 if (userVO.getProjectId() != -1) {
                     set.add(userVO.getProjectId());
+                    set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 } else {
                     QueryWrapper<Project> qw = new QueryWrapper<>();
@@ -574,6 +576,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             set.add(projectUser.getProjectId());
                         }
                     }
+                    set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 }
             }
@@ -670,6 +673,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     moulds = mouldMapper.selectListByCondition(userVO);
                 } else if (Constant.PRODUCER_COMPANY == userVO.getSubordinateType()) {
                     set = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", userVO.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
+                    set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 }
             } else {
@@ -677,6 +681,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //充当项目经理参与的项目
                 if (userVO.getProjectId() != -1) {
                     set.add(userVO.getProjectId());
+                    set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 } else {
                     QueryWrapper<Project> qw = new QueryWrapper<>();
@@ -701,6 +706,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             set.add(projectUser.getProjectId());
                         }
                     }
+                    set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 }
             }
@@ -710,4 +716,29 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getModelListByCompanyIdAndProjectId(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        QueryWrapper<Mould> qw = new QueryWrapper<>();
+        Integer companyId = -1;
+        if (Constant.SYS_ID == user.getParentId()) {
+            //此时是admin
+            User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getId()));
+            companyId = admin.getCompanyId();
+//            qw.eq("company_id", admin.getCompanyId());
+        } else if (Constant.SYS_PARENT_ID == user.getParentId()) {
+            //系统管理员
+//            qw.eq("company_type",Constant.ASSETS_COMPANY);
+        } else {
+            //此时是项目经理
+            User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
+            companyId = admin.getCompanyId();
+//            qw.eq("company_id", admin.getCompanyId());
+        }
+//        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", companyId).isNull("project_id"));
+        msg.data = mouldMapper.selectListByCompanyId(companyId,userVO.getProjectId());
+        return msg;
+    }
 }

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

@@ -53,7 +53,7 @@
         where
         tbme.belong_company_id = #{belongCompanyId}
         and
-        tbme.id not in
+        tbme.id in
         <foreach item="item" index="index" collection="list"
                  open="(" separator="," close=")">
             #{item}

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

@@ -221,6 +221,9 @@ select
           tbm.company_id = #{companyId}
           AND tbm.equipment_id is not null
           AND tbm.project_id is null
+        <if test="projectId != null">
+          OR tbm.project_id = #{projectId}
+        </if>
     </select>
     
     <update id="updateModelProjectIdAndEquipmentIdToNullById">