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

cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -16,4 +16,5 @@ public class Constant {
     public static final String PROJECT_PREFIX = "YMXM";//项目编号
     public static final String UPLOAD = "上传";//上传
     public static final String DOWNLOAD = "下载";//下载
+    public static final Integer APPROVAL_AUTHORITY = 3;//审批权限
 }

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

@@ -79,16 +79,16 @@ public class ProjectController {
 
     /**
      * 项目详情
-     * 参数: id 项目id
+     * 参数: id 项目id,token 用户凭证
      *
      * @return
      */
     @ApiOperation("项目详情")
     @RequestMapping("/detail")
     @ResponseBody
-    public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project) {
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project,String token) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = projectService.getProjectDetail(project);
+        msg = projectService.getProjectDetail(project,token);
         return msg;
     }
 

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

@@ -55,8 +55,8 @@ public class ProjectFileController {
         return msg;
     }
     /**
-     * 项目文档的上传
-     * 参数: token 用户身份凭证，id
+     * 项目文档的下载
+     * 参数: token 用户身份凭证，projectId 项目id
      *
      * @return
      */

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

@@ -127,16 +127,16 @@ public class UserController {
 
     /**
      * 给项目分配参与人的时候根据公司id获取公司下的人员
-     * 参数：companyIds 公司ids ,id当前操作人的id
+     * 参数：companyIds 公司ids ,id当前操作人的id,projectId 项目id
      *
      * @return
      */
     @ApiOperation("根据公司id获取公司下的人员")
     @RequestMapping("/getUserListByCompanyIds")
     @ResponseBody
-    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id){
+    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id,@RequestParam(required = false) Integer projectId){
         System.out.println("companyIds"+companyIds);
-        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id);
+        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id,projectId);
         return msg;
     }
 

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -73,6 +75,7 @@ public class ProjectFile extends Model<ProjectFile> {
      * 上传时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

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

@@ -1,9 +1,13 @@
 package com.hssx.cloudmodel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -22,7 +26,7 @@ public class ProjectOperationDynamics extends Model<ProjectOperationDynamics> {
     /**
      * 项目操作记录表主键
      */
-    @TableField("id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -41,6 +45,7 @@ public class ProjectOperationDynamics extends Model<ProjectOperationDynamics> {
      * 操作时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -120,7 +125,7 @@ public class ProjectOperationDynamics extends Model<ProjectOperationDynamics> {
 
     @Override
     protected Serializable pkVal() {
-        return null;
+        return this.id;
     }
 
     @Override

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

@@ -28,9 +28,9 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getUserByCompanyIdOrSubordinateType(User user);
 
-    HttpRespMsg getProjectDetail(Project project);
+    HttpRespMsg getProjectDetail(Project project,String token);
 
-    HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId);
+    HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId,Integer projectId);
 
     HttpRespMsg getModelListByCompanyId(User user);
 

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

@@ -47,6 +47,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     MouldMapper mouldMapper;
     @Resource
     ProjectApproveMapper projectApproveMapper;
+    @Resource
+    PowerMapper powerMapper;
 
     @Override
     public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user, String userIds,
@@ -111,6 +113,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
                 //删除之前的项目审批人
                 projectApproveMapper.delete(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                //删除权限表里的审批权限数据
+                powerMapper.delete(new QueryWrapper<Power>().eq("project_id", project.getId()).eq("power_type",Constant.APPROVAL_AUTHORITY));
                 //重新添加审批人
                 //1.添加资产方审批人
                 if(null != customerApproverId){
@@ -124,6 +128,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     projectApprove.setProjectId(project.getId());
                     projectApprove.setSubordinateType(customerExaminer.getSubordinateType());
                     projectApproveMapper.insert(projectApprove);
+                    Power power = new Power();
+                    power.setUserId(customerExaminer.getId());
+                    power.setProjectId(project.getId());
+                    power.setPowerType(Constant.APPROVAL_AUTHORITY);
+                    powerMapper.insert(power);
                 }
                 if(null != ownerApproverId){
                     //2.添加生产方审批人
@@ -137,6 +146,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     ownerProjectApprove.setProjectId(project.getId());
                     ownerProjectApprove.setSubordinateType(ownerExaminer.getSubordinateType());
                     projectApproveMapper.insert(ownerProjectApprove);
+                    Power power = new Power();
+                    power.setUserId(ownerExaminer.getId());
+                    power.setProjectId(project.getId());
+                    power.setPowerType(Constant.APPROVAL_AUTHORITY);
+                    powerMapper.insert(power);
                 }
                 //删除之前分配的人员
                 QueryWrapper<ProjectUser> qwPro = new QueryWrapper<>();
@@ -225,8 +239,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getProjectDetail(Project project) {
+    public HttpRespMsg getProjectDetail(Project project,String token) {
         HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        if(Constant.SYS_PARENT_ID == currentUser.getParentId()){
+            //超级管理员
+        }
         ProjectVO vo = projectMapper.getProjectById(project.getId());
         List<User> users = projectMapper.getProjectUserById(project.getId());
         //处理users按照客户呼和供应商分组
@@ -245,11 +263,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId) {
+    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId,Integer projectId) {
         HttpRespMsg msg = new HttpRespMsg();
         if (!"".equals(companyIds) && companyIds != null) {
             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
-            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId));
+            //该项目的项目经理不能充当参与人
+            Integer managerId = -1;
+            if(projectId != null){
+                Project project = projectMapper.selectById(projectId);
+                if(null != project.getManagerId()){
+                    managerId = project.getManagerId();
+                }
+            }
+            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("id",managerId));
         }
         return msg;
     }

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

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectOperationDynamics">
-        <result column="id" property="id" />
+        <id column="id" property="id" />
         <result column="operator" property="operator" />
         <result column="operator_id" property="operatorId" />
         <result column="indate" property="indate" />