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

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

@@ -1,6 +1,7 @@
 package com.hssx.cloudmodel.controller;
 
 
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.PowerService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
@@ -35,8 +36,8 @@ public class PowerController {
     @ApiOperation("权限列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(String token, PageUtil page){
-        HttpRespMsg msg = powerService.getList(token,page);
+    public HttpRespMsg list(String token, PageUtil page, UserVO userVO){
+        HttpRespMsg msg = powerService.getList(userVO,token,page);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/ProjectVO.java

@@ -20,5 +20,10 @@ public class ProjectVO extends Project {
     private List<ProjectApprove>approves = new ArrayList<>();
     private List<CustomCompany> customCompanies = new ArrayList<>();
     private List<Power>powers = new ArrayList<>();
+    private Integer projectId;
+    private Integer userId;
+    private String companyName;
+    private String powerString;
+
 
 }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/UserVO.java

@@ -16,6 +16,7 @@ public class UserVO extends User {
     private String keyName;//项目名称
     private Integer searchType;//搜索类型0-模具编号，1-模具名称
     private Integer projectId;
+    private Integer companyId;
     private Integer isManager = 0;
 
     public Integer getProjectId() {

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

@@ -4,6 +4,7 @@ import com.hssx.cloudmodel.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.ProjectVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.apache.ibatis.annotations.Param;
@@ -26,5 +27,5 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<User> getProjectUserById(@Param("id")Integer id);
 
-    List<ProjectVO> selectUserPowerList(@Param("user") User user, @Param("type") Integer type);
+    List<ProjectVO> selectUserPowerList(@Param("user") UserVO user, @Param("type") Integer type);
 }

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

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.Power;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -15,5 +16,5 @@ import com.hssx.cloudmodel.util.PageUtil;
  */
 public interface PowerService extends IService<Power> {
 
-    HttpRespMsg getList(String token,PageUtil page);
+    HttpRespMsg getList(UserVO userVO,String token,PageUtil page);
 }

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

@@ -8,6 +8,7 @@ import com.hssx.cloudmodel.entity.Power;
 import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.ProjectVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.PowerMapper;
 import com.hssx.cloudmodel.mapper.ProjectMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
@@ -16,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,7 +43,7 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
     ProjectMapper projectMapper;
 
     @Override
-    public HttpRespMsg getList(String token, PageUtil page) {
+    public HttpRespMsg getList(UserVO userVO, String token, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
         List<ProjectVO> list = new ArrayList<>();
         Integer type = 0;
@@ -49,17 +51,18 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         QueryWrapper<Project> qw = new QueryWrapper<>();
         Integer count = projectMapper.selectCount(qw.eq("manager_id", user.getId()));
+        BeanUtils.copyProperties(user ,userVO);
         if (user != null) {
             if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 //平台超级管理员
                 msg.setError("对不起你不具备该项权限!");
             } else if (Constant.SYS_ID == user.getParentId()) {
                 //资产方管理员,展示此人创建所有项目对应的权限
-                list = projectMapper.selectUserPowerList(user,type);
+                list = projectMapper.selectUserPowerList(userVO,type);
             } else if (count > 0) {
                 //项目经理
                 type = 1;
-                list = projectMapper.selectUserPowerList(user,type);
+                list = projectMapper.selectUserPowerList(userVO,type);
             } else {
                 //普通用户
                 msg.setError("对不起你不具备该项权限!");

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

@@ -156,7 +156,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 for (String id : list) {
                     User user = userMapper.selectById(id);
                     ProjectUser projectUser = new ProjectUser();
-                    projectUser.setId(Integer.parseInt(id));
+                    projectUser.setUserId(Integer.parseInt(id));
                     projectUser.setProjectId(project.getId());
                     projectUser.setSubordinate(user.getSubordinateType());
                     projectUserMapper.insert(projectUser);
@@ -208,6 +208,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         ProjectVO vo = projectMapper.getProjectById(project.getId());
         List<User> users = projectMapper.getProjectUserById(project.getId());
         //处理users按照客户呼和供应商分组
+        System.out.println("users===>"+users);
         for (User user : users) {
             if (user.getSubordinateType() == 0) {
                 //资产方

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

@@ -63,6 +63,7 @@
                 p.project_name like concat('%',#{keyName},'%')
             </if>
         </where>
+        GROUP BY p.id
         order by p.id desc
     </select>
     <!--一对多的子查询 queryCustomCompaniesId-->
@@ -143,7 +144,7 @@
           u.id id, u.username username, u.indate indate, u.head_imgurl head_imgurl, u.subordinate_type subordinate_type
         from
           tb_project_user pu
-        left join
+        RIGHT join
           tb_user u
         on
           pu.user_id = u.id
@@ -154,26 +155,57 @@
     <resultMap id="BaseResultMapPowerList" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
         <id column="id" property="id" />
         <result column="project_name" property="projectName" />
-        <result column="project_no" property="projectNo" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="content" property="content" />
-        <result column="creator_id" property="creatorId" />
-        <result column="creator" property="creator" />
-        <result column="is_delete" property="isDelete" />
-        <result column="owner_company" property="ownerCompany" />
-        <result column="owner_company_name" property="ownerCompanyName" />
-        <result column="indate" property="indate" />
-        <result column="manager_id" property="managerId" />
-        <result column="manager" property="manager" />
-        <!--以下是分页插件的一对多-->
-        <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"
-                    select="queryPowerListById" column="id" >
-        </collection>
+        <result column="project_id" property="projectId" />
+        <result column="user_id" property="userId" />
+        <result column="company_name" property="companyName" />
+        <result column="powerString" property="powerString" />
     </resultMap>
-
     <select id="selectUserPowerList" resultMap="BaseResultMapPowerList">
-
+      SELECT
+      tbpu.user_id ,tbpu.project_id ,GROUP_CONCAT(tbpu.power_type) powerString,
+        tbu.username ,tbc.company_name,
+        tbp.project_name
+      FROM `tb_project_user` tbpu
+      left join
+      tb_project tbp
+      on tbp.id = tbpu.project_id
+      left join
+      tb_user tbu
+      on tbpu.user_id = tbu.id
+      left join
+      tb_company tbc
+      on tbc.id = tbu.company_id
+        <where>
+            <if test="user.projectId != null">
+                tbpu.project_id = #{user.projectId}
+            </if>
+            <if test="user.companyId != null">
+                tbpu.project_id = #{user.companyId}
+            </if>
+            <if test="user.keyName != null and user.keyName != ''">
+                tbu.username like concat('%',#{user.keyName},'%')
+            </if>
+            <if test="type == 0">
+                tbp.creator_id = #{user.id}
+            </if>
+            <if test="type == 1">
+                tbp.manager_id = #{user.id}
+            </if>
+        </where>
+      GROUP BY tbpu.user_id ,tbpu.project_id;
+      order by tbpu.user_id
     </select>
+    <!--<resultMap id="PowerMap" type="com.hssx.cloudmodel.entity.Power">-->
+        <!--<id column="id" property="id" />-->
+        <!--<result column="power_type" property="powerType" />-->
+        <!--<result column="user_id" property="userId" />-->
+        <!--<result column="project_id" property="projectId" />-->
+        <!--<result column="indate" property="indate" />-->
+        <!--<result column="operating_documents_type" property="operatingDocumentsType" />-->
+    <!--</resultMap>-->
+    <!--&lt;!&ndash;以下是分页插件的一对多的子集sql&ndash;&gt;-->
+    <!--<select id="queryPowerListById" resultMap="PowerMap">-->
+
+    <!--</select>-->
 
 </mapper>

ys_vue/src/views/detection/detection.vue

@@ -41,7 +41,10 @@
       <el-table-column prop="state" label="当前状态" width="100" sortable></el-table-column>
       <el-table-column label="模具保养" width="100">
         <template slot-scope="scope">
-          <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">不需要</a>
+          <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">
+            <span v-if="scope.row.runTimes > scope.row.initialModulus">需要</span>
+            <span v-else>不需要</span>
+          </a>
         </template>
       </el-table-column>
     </el-table>