Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ys_vue/src/port.js

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

@@ -16,5 +16,8 @@ public class Constant {
     public static final String PROJECT_PREFIX = "YMXM";//项目编号
     public static final String UPLOAD = "上传";//上传
     public static final String DOWNLOAD = "下载";//下载
+    public static final Integer UPDATE_AUTHORITY = 0;//修改权限
+    public static final Integer DOWNLOAD_AUTHORITY = 1;//下载权限
+    public static final Integer VIEW_AUTHORITY = 2;//浏览权限
     public static final Integer APPROVAL_AUTHORITY = 3;//审批权限
 }

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

@@ -110,5 +110,19 @@ public class CompanyController {
         return msg;
     }
 
+    /**
+     * 项目分配生产方公司列表
+     * @return
+     */
+    @ApiOperation(value = "项目分配生产方公司列表")
+    @RequestMapping("/addCompanyListToProject")
+    @ResponseBody
+    public HttpRespMsg addCompanyListToProject(User user){
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Company> list = companyService.addCompanyListToProject(user);
+        msg.data = list;
+        return msg;
+    }
+
 }
 

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

@@ -41,18 +41,21 @@ public class MouldFileController {
     private UserService userService;
     /**
      * 模具文档的上传
-     * 参数: token 用户身份凭证，projectId 项目id ,file 文件信息
+     * 参数: token 用户身份凭证，
+     * mouldId 模具id ,
+     * blongType 文档类型（0-模具文档 1-零件文档 2-试模验收 2-保养方案 3-模具更新 4-模具报废），
+     * file 文件信息
      *
      * @return
      */
     @ApiOperation("模具文档的上传")
     @RequestMapping("/uploadFile")
     @ResponseBody
-    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file,
+    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file,@RequestParam(required = false, defaultValue = "0") Integer blongType,
                                   HttpServletResponse response, HttpServletRequest request, UserVO userVO) throws Exception {
         System.out.println("开始上传文件" + "file+" + file.getOriginalFilename());
         HttpRespMsg msg = new HttpRespMsg();
-        msg = mouldFileService.addFile(userVO,file,path);
+        msg = mouldFileService.addFile(userVO,blongType, file,path);
         return msg;
     }
 
@@ -68,16 +71,30 @@ public class MouldFileController {
     }
 
     /**
-     * 项目文档的列表
-     * 参数: token 用户身份凭证，projectId 项目id
+     * 模具文档的列表
+     * 参数: token 用户身份凭证，mouldId 模具id， type文档类型:0-模具文档，1-零件文档
      *
      * @return
      */
     @ApiOperation("模具文档的列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(@RequestParam Integer mouldId,  UserVO userVO){
-        HttpRespMsg msg = mouldFileService.getFileList(mouldId, userVO);
+    public HttpRespMsg list(@RequestParam Integer mouldId, @RequestParam Integer blongType,  UserVO userVO){
+        HttpRespMsg msg = mouldFileService.getFileList(mouldId,blongType, userVO);
+        return msg;
+    }
+
+    /**
+     * 模具文档的列表
+     * 参数: token 用户身份凭证，mouldId 模具id， type文档类型:0-模具文档，1-零件文档
+     *
+     * @return
+     */
+    @ApiOperation("模具所有类型的文档列表")
+    @RequestMapping("/allList")
+    @ResponseBody
+    public HttpRespMsg allList(@RequestParam Integer mouldId, UserVO userVO){
+        HttpRespMsg msg = mouldFileService.getAllFileList(mouldId,userVO);
         return msg;
     }
 }

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

@@ -65,7 +65,7 @@ public class ProjectFileController {
     @ResponseBody
     public HttpRespMsg dowloadFile(ProjectFile projectFile,String token){
         HttpRespMsg msg = projectFileService.dowloadFile(projectFile,token);
-        return null;
+        return msg;
     }
 
     /**
@@ -81,5 +81,19 @@ public class ProjectFileController {
         HttpRespMsg msg = projectFileService.getFileList(userVO);
         return msg;
     }
+
+    /**
+     * 项目文档的删除
+     * 参数: id 文档id
+     *
+     * @return
+     */
+    @ApiOperation("项目文档的删除")
+    @RequestMapping("/delFile")
+    @ResponseBody
+    public HttpRespMsg delFile(ProjectFile projectFile){
+        HttpRespMsg msg = projectFileService.delFile(projectFile);
+        return msg;
+    }
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Power.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;
 
 /**
@@ -49,6 +51,7 @@ public class Power extends Model<Power> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

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

@@ -25,4 +25,6 @@ public interface CompanyService extends IService<Company> {
     List<Company> getIdAndNamelist(User user);
 
     HttpRespMsg deleteById(Integer id);
+
+    List<Company> addCompanyListToProject(User user);
 }

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

@@ -16,9 +16,9 @@ import org.springframework.web.multipart.MultipartFile;
  * @since 2019-08-07
  */
 public interface MouldFileService extends IService<MouldFile> {
-    HttpRespMsg addFile(UserVO userVO, MultipartFile file, String path);
+    HttpRespMsg addFile(UserVO userVO, Integer blongType,MultipartFile file, String path);
     HttpRespMsg check(Integer mouldFileId, Integer isPass, UserVO userVO);
     HttpRespMsg dowloadFile(MouldFile projectFile, String token);
-
-    HttpRespMsg getFileList(int mouldId, UserVO userVO);
+    HttpRespMsg getAllFileList(int mouldId, UserVO userVO);
+    HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO);
 }

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

@@ -21,4 +21,6 @@ public interface ProjectFileService extends IService<ProjectFile> {
     HttpRespMsg dowloadFile(ProjectFile projectFile, String token);
 
     HttpRespMsg getFileList(UserVO userVO);
+
+    HttpRespMsg delFile(ProjectFile projectFile);
 }

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

@@ -82,11 +82,18 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }else{
             //此时是项目经理创建其他用户
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
-            qw.eq("company_type",Constant.ASSETS_COMPANY).or().eq("id",admin.getCompanyId());
+            qw.eq("company_type",Constant.PRODUCER_COMPANY).or().eq("id",admin.getCompanyId());
         }
         return companyMapper.selectList(qw);
     }
 
+    @Override
+    public List<Company> addCompanyListToProject(User user) {
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        qw.eq("company_type",Constant.PRODUCER_COMPANY);
+        return companyMapper.selectList(qw);
+    }
+
     @Override
     public HttpRespMsg deleteById(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -98,4 +105,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }
         return msg;
     }
+
+
 }

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

@@ -21,6 +21,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
@@ -44,7 +46,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     ProjectOperationDynamicsMapper projectOperationDynamicsMapper;
 
     @Override
-    public HttpRespMsg addFile(UserVO userVO, MultipartFile file, String path) {
+    public HttpRespMsg addFile(UserVO userVO,Integer blongType, MultipartFile file, String path) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if(user != null){
@@ -160,10 +162,26 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     }
 
     @Override
-    public HttpRespMsg getFileList(int mouldId, UserVO userVO) {
+    public HttpRespMsg getAllFileList(int mouldId, UserVO userVO) {
+        List<HashMap> dataList = new ArrayList<HashMap>();
+        int maxBlongType = 5;
+        for (int i=0;i<=maxBlongType; i++) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("blongType", i);
+            List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", i).orderByDesc("id"));
+            data.put("list", list);
+            dataList.add(data);
+        }
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = dataList;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getFileList(int mouldId,Integer blongType,  UserVO userVO) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
-        List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).orderByDesc("id"));
+        List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
         msg.data = list;
         return msg;
     }

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

@@ -102,7 +102,16 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
     public HttpRespMsg dowloadFile(ProjectFile projectFile, String token) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
-        return null;
+        //添加上传记录
+        ProjectOperationDynamics dynamics = new ProjectOperationDynamics();
+        dynamics.setContent(Constant.UPLOAD);
+        ProjectFile file = projectFileMapper.selectById(projectFile.getId());
+        dynamics.setFileName(file.getFileName());
+        dynamics.setOperatorId(user.getId());
+        dynamics.setOperator(user.getUsername());
+        dynamics.setProjectId(projectFile.getProjectId());
+        projectOperationDynamicsMapper.insert(dynamics);
+        return msg;
     }
 
     @Override
@@ -113,4 +122,11 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
         msg.data = list;
         return msg;
     }
+
+    @Override
+    public HttpRespMsg delFile(ProjectFile projectFile) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = projectFileMapper.deleteById(projectFile.getId());
+        return msg;
+    }
 }

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

@@ -96,7 +96,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             } else if (flag == 1) {
                 projectMapper.updateById(project);
                 //删除之前添加的生产方公司
-                customCompanyMapper.delete(new QueryWrapper<CustomCompany>().eq("project_id",project.getId()));
+                customCompanyMapper.delete(new QueryWrapper<CustomCompany>().eq("project_id", project.getId()));
                 //重新添加生产方公司
                 if (customerCompanyIds != null && !"".equals(customerCompanyIds) && customerCompanyNames != null && !"".equals(customerCompanyNames)) {
                     List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(customerCompanyIds);
@@ -114,10 +114,10 @@ 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));
+                powerMapper.delete(new QueryWrapper<Power>().eq("project_id", project.getId()).eq("power_type", Constant.APPROVAL_AUTHORITY));
                 //重新添加审批人
                 //1.添加资产方审批人
-                if(null != customerApproverId){
+                if (null != customerApproverId) {
                     User customerExaminer = userMapper.selectById(customerApproverId);
                     Company company = companyMapper.selectById(customerExaminer.getCompanyId());
                     ProjectApprove projectApprove = new ProjectApprove();
@@ -134,7 +134,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     power.setPowerType(Constant.APPROVAL_AUTHORITY);
                     powerMapper.insert(power);
                 }
-                if(null != ownerApproverId){
+                if (null != ownerApproverId) {
                     //2.添加生产方审批人
                     User ownerExaminer = userMapper.selectById(ownerApproverId);
                     Company company = companyMapper.selectById(ownerExaminer.getCompanyId());
@@ -239,16 +239,42 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getProjectDetail(Project project,String token) {
+    public HttpRespMsg getProjectDetail(Project project, String token) {
+        Map<String, Object> map = new HashMap<>();
         HttpRespMsg msg = new HttpRespMsg();
+        ProjectVO vo = projectMapper.getProjectById(project.getId());
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
-        if(Constant.SYS_PARENT_ID == currentUser.getParentId()){
-            //超级管理员
+        if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+            //当前人超级管理员 ,对项目止咳浏览
+            map.put("power", Constant.VIEW_AUTHORITY);
+        } else if (vo.getManagerId() == currentUser.getId()) {
+            //当前人是该项目的项目经理
+            String power = Constant.UPDATE_AUTHORITY + "," + Constant.DOWNLOAD_AUTHORITY
+                    + "," + Constant.VIEW_AUTHORITY;
+            if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId())) > 0) {
+                //查看当前项目经理是否为审批人
+                power = power+","+ Constant.APPROVAL_AUTHORITY;
+            }
+            map.put("power",power);
+        } else {
+            //该项目的参与人
+            StringBuilder pow = new StringBuilder();
+            List<Power> powers = powerMapper.selectList(new QueryWrapper<Power>().eq("project_id", project.getId()).eq("user_id", currentUser.getId()));
+            if(powers.size()>0){
+                for (Power power : powers) {
+                    if(pow.length()<0){
+                        pow.append(power.getPowerType());
+                    }else{
+                        pow.append(",");
+                        pow.append(power.getPowerType());
+                    }
+                }
+            }
+            map.put("power",pow.toString());
         }
-        ProjectVO vo = projectMapper.getProjectById(project.getId());
         List<User> users = projectMapper.getProjectUserById(project.getId());
         //处理users按照客户呼和供应商分组
-        System.out.println("users===>"+users);
+        System.out.println("users===>" + users);
         for (User user : users) {
             if (user.getSubordinateType() == 0) {
                 //资产方
@@ -258,24 +284,25 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 vo.getCustomUsers().add(user);
             }
         }
-        msg.data = vo;
+        map.put("vo",vo);
+        msg.data = map;
         return msg;
     }
 
     @Override
-    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId,Integer projectId) {
+    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId, Integer projectId) {
         HttpRespMsg msg = new HttpRespMsg();
         if (!"".equals(companyIds) && companyIds != null) {
             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
             //该项目的项目经理不能充当参与人
             Integer managerId = -1;
-            if(projectId != null){
+            if (projectId != null) {
                 Project project = projectMapper.selectById(projectId);
-                if(null != project.getManagerId()){
+                if (null != project.getManagerId()) {
                     managerId = project.getManagerId();
                 }
             }
-            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("id",managerId));
+            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("parent_id",Constant.SYS_ID));
         }
         return msg;
     }

ys_vue/src/port.js

@@ -40,13 +40,13 @@ export default {
         roles: '/user/getRoleList', //获取角色列表
 
         addCompany: '/company/add',  //（公司）
-        companyList: '/company/list',
-        delCompany: '/company/delete',
+        companyList: '/company/list', 
+        delCompany: '/company/delete', 
         companys: '/company/getCompanyList', //创建账号是所获取的公司列表
         comps: '/company/getCompanys', //创建模具获取的(资产方)公司列表
 
         addFactory: '/factory/add',  //（工厂）
-        factoryList: '/factory/list',
+        factoryList: '/factory/list', 
         delFactory: '/factory/delete',
 
         editMould: '/mouldequipment/addOrUpdate', //添加/修改模具设备

ys_vue/src/views/project/projectDetail.vue

@@ -73,14 +73,14 @@
                 <el-table :data="files" highlight-current-row v-loading="listLoading" height="400" style="width: 100%;">
                     <el-table-column type="index" width="40"></el-table-column>
                     <el-table-column prop="fileName" label="名称" sortable></el-table-column>
-                    <el-table-column prop="fileSize" label="大小" width="150" sortable></el-table-column>
-                    <el-table-column prop="uploader" label="上传者" width="120" sortable></el-table-column>
-                    <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
-                    <el-table-column label="操作" width="220" sortable>
+                    <el-table-column prop="fileSize" label="大小" width="150" align="center" sortable></el-table-column>
+                    <el-table-column prop="uploader" label="上传者" width="120" align="center" sortable></el-table-column>
+                    <el-table-column prop="indate" label="上传时间" width="200" align="center" sortable></el-table-column>
+                    <el-table-column label="操作" width="220" align="center" sortable>
                         <template slot-scope="scope">
-                            <el-button size="small">
+                            <el-button size="small" @click="dowloadFile(scope.row.id)">
                                 <a :href="scope.row.url" :download="scope.row.fileName">下载</a></el-button>
-                            <el-button size="small" type="danger" v-if="scope.row.uploaderId == user.id">删除</el-button>
+                            <el-button size="small" type="danger" @click="fileDel(scope.row.id)" v-if="scope.row.uploaderId == user.id">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -248,8 +248,8 @@
                     id: this.detailId
                 }, res => {
                     if (res.code == "ok") {
-                        var list = res.data;
-                        var approves = res.data.approves;
+                        var list = res.data.vo;
+                        var approves = res.data.vo.approves;
 
                         for(var i in approves){
                             if(approves[i].subordinateType == 0){
@@ -258,9 +258,10 @@
                                 list.customerApprover = approves[i].approverName;
                             }
                         }
-
                         this.proDetail = list;
-                        this.getMsg();
+                        if(this.user.parentId != 0){
+                            this.getMsg();
+                        }
                     } else {
                         this.$message({
                             message: res.msg,
@@ -579,6 +580,42 @@
                     });
                 })
             },
+            //下载
+            dowloadFile(id) {
+                this.http.post(this.port.project.dowloadFile, {
+                    projectId: id
+                }, res => {
+                }, error => {
+                })
+            },
+            //删除上传文件
+			fileDel(id) {
+                this.$confirm('确认删除该文档吗?', '提示', {
+					type: 'warning'
+				}).then(() => {
+                    this.http.post(this.port.project.delFile, {
+                        id: id
+                    }, res => {
+                        if (res.code == "ok") {
+                            this.$message({
+                                message: '删除成功',
+                                type: 'success'
+                            });
+                            this.getFileList();
+                        } else {
+                            this.$message({
+                                message: res.msg,
+                                type: 'error'
+                            });
+                        }
+                    }, error => {
+                        this.$message({
+                            message: error,
+                            type: 'error'
+                        });
+                    })
+				});
+            },
         },
         created() {
             let height = window.innerHeight;
@@ -596,6 +633,11 @@
 </script>
 
 <style scoped>
+    a {
+        text-decoration:none;
+        color: #333;
+    }
+
     .allDetail {
         overflow-y: auto;
     }