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

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

@@ -139,8 +139,5 @@ public class CompanyController {
         msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
         return msg;
     }
-
-
-
 }
 

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

@@ -12,17 +12,19 @@ import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.Map;
 
 /**
  * <p>
@@ -160,7 +162,7 @@ public class MouldFileController {
 
 //    @RequestMapping(value = "xxx/xxx",method = RequestMethod.POST)
 //    @ResponseBody
-//    public Map<String,Object> feedBackDirectMultiDownload(HttpServletRequest request,HttpServletResponse response) throws IOException{
+//    public Map<String,Object> feedBackDirectMultiDownload(HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        //压缩文件初始设置
 //        String path="压缩文件想要放置的路径";
 //        base_name = "zip文件名";

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

@@ -41,6 +41,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     MouldMapper mouldMapper;
     @Resource
     ProjectUserMapper projectUserMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
 
     @Override
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag) {
@@ -165,7 +167,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             }
             companyVOS = companyMapper.getListMould(mouldIds);
         } else {
-            //此时是项目经理创建其他用户
+            //此时是项目经理
             QueryWrapper<Project> qw = new QueryWrapper<>();
             qw.eq("manager_id", currentUser.getId());
             List<Integer> set = new ArrayList<>();
@@ -183,6 +185,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                     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());
+                }
+            }
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
             List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {

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

@@ -48,6 +48,8 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     MouldMapper mouldMapper;
     @Resource
     ProjectUserMapper projectUserMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
 
     @Override
     public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, MultipartFile file2, String path) {
@@ -280,6 +282,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     proIds.add(projectUser.getProjectId());
                 }
             }
+            //充当审批人员参与的项目
+            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+            if (projectss.size() > 0) {
+                for (ProjectApprove projectUser : projectss) {
+                    proIds.add(projectUser.getProjectId());
+                }
+            }
             list = mouldFileMapper.getFileListByProjectId(userVO,proIds);
         }
         PageInfo<MouldFileVO> pageInfos = new PageInfo<>(list);

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

@@ -388,6 +388,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             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);
                 }
             }

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

@@ -53,9 +53,11 @@
         tb_project p
         left join tb_project_user pu
         on p.id = pu.project_id
+        left join tb_project_approve tpa
+        on tpa.project_id = p.id
         <where>
             <if test="currentUser.id != 1">
-                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id}
+                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id} OR tpa.approver_id = #{currentUser.id}
             </if>
             <if test="keyName != null and keyName != ''">
                 p.project_name like concat('%',#{keyName},'%')

ys_vue/src/port.js

@@ -40,12 +40,12 @@ export default {
         addMold: '/mould/addOrUpdate', //添加/修改模具设备
         molds: '/mould/list', //模具列表
         modelList: '/mould/modelList', //给项目分配模具获取该公司下的模具列表
-
         moldDetail: '/mould/detail', //模具详情
-        moldFileList: '/mouldfile/list', //获取模具文档*
+        moldFileList: '/mouldfile/list', //获取模具文档
         moldFileListAll: '/mouldfile/allList', //获取全部模具文档
-        moldFileUpload: '/mouldfile/uploadFile', //上传模具文档*
+        moldFileUpload: '/mouldfile/uploadFile', //上传模具文档
         moldFileDowload: '/mouldfile/dowloadFile', //模具文档的下载
+        moldFileDowloadList: '/mouldfile/fileList', //获取模具文档下载列表
         moldFileCheck: '/mouldfile/check', //审批模具文档 
         moldFileDelete: '/mouldfile/delFile', //项目文档的删除
         moldOperationList: '/mouldoperationdynamics/list', //项目文档的删除

ys_vue/src/views/mold/moldDownload.vue

@@ -3,19 +3,8 @@
     <!--工具条-->
     <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
       <el-form :inline="true" :model="filters">
-        <el-col :span="2">
-          <el-form-item>
-            <el-select v-model="filters.value" clearable placeholder="文档类型">
-              <el-option label="模具3D图档" value="0"></el-option>
-              <el-option label="模具2D图档" value="1"></el-option>
-              <el-option label="零件3D图档" value="2"></el-option>
-              <el-option label="零件2D图档" value="3"></el-option>
-              <el-option label="模具保养方案" value="4"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入名称进行搜索"></el-input>
+          <el-input v-model="filters.name" placeholder="请输入模具名称进行搜索"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary">查询</el-button>
@@ -41,7 +30,7 @@
 
     <!--列表-->
     <el-table
-      :data="moulds"
+      :data="documents"
       :height="tableHeight"
       highlight-current-row
       v-loading="listLoading"
@@ -50,40 +39,40 @@
     >
       <el-table-column type="selection" width="40"></el-table-column>
       <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column width="200" label="模具名称" prop="name"></el-table-column>
+      <el-table-column width="200" label="模具名称" prop="modelName"></el-table-column>
       <el-table-column width="200" label="模具3D图档">
         <template slot-scope="scope">
-          <span v-if="scope.row.states[0] == 0">未上传</span>
-          <span v-else-if="scope.row.states[0] == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.mould3DFiles.length == 0">未上传</span>
+          <span v-else-if="scope.row.mould3DFiles.state == 3">已通过</span>
+          <span v-else>未通过</span>
         </template>
       </el-table-column>
       <el-table-column width="200" label="模具2D图档">
         <template slot-scope="scope">
-          <span v-if="scope.row.states[1] == 0">未上传</span>
-          <span v-else-if="scope.row.states[1] == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.mould2DFiles.length == 0">未上传</span>
+          <span v-else-if="scope.row.mould2DFiles.state == 3">已通过</span>
+          <span v-else>未通过</span>
         </template>
       </el-table-column>
       <el-table-column width="200" label="零件3D图档">
         <template slot-scope="scope">
-          <span v-if="scope.row.states[2] == 0">未上传</span>
-          <span v-else-if="scope.row.states[2] == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.sparepart3DFiles.length == 0">未上传</span>
+          <span v-else-if="scope.row.sparepart3DFiles.state == 3">已通过</span>
+          <span v-else>未通过</span>
         </template>
       </el-table-column>
       <el-table-column width="200" label="零件2D图档">
         <template slot-scope="scope">
-          <span v-if="scope.row.states[3] == 0">未上传</span>
-          <span v-else-if="scope.row.states[3] == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.sparepart2DFiles.length == 0">未上传</span>
+          <span v-else-if="scope.row.sparepart2DFiles.state == 3">已通过</span>
+          <span v-else>未通过</span>
         </template>
       </el-table-column>
       <el-table-column width="200" label="保养方案">
         <template slot-scope="scope">
-          <span v-if="scope.row.states[4] == 0">未上传</span>
-          <span v-else-if="scope.row.states[4] == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.maintainFiles.length == 0">未上传</span>
+          <span v-else-if="scope.row.maintainFiles.state == 3">已通过</span>
+          <span v-else>未通过</span>
         </template>
       </el-table-column>
     </el-table>
@@ -108,20 +97,14 @@ import util from "../../common/js/util";
 export default {
   data() {
     return {
-      moulds: [
-        //临时数据
-        { id: 1, name: "墨盒类型1", states: [0, 1, 2, 0, 1] },
-        { id: 2, name: "墨盒类型2", states: [2, 0, 1, 2, 0] },
-        { id: 3, name: "墨盒类型3", states: [1, 2, 0, 1, 2] },
-        { id: 4, name: "墨盒类型4", states: [0, 1, 2, 0, 1] },
-        { id: 5, name: "墨盒类型5", states: [2, 0, 1, 2, 0] },
-        { id: 6, name: "墨盒类型6", states: [2, 2, 2, 2, 2] }
-      ],
+      documents: [],
       filters: {
         name: "",
         value: ""
       },
       listLoading: false,
+      page: 1,
+      size: 20,
       total: 0,
       tableHeight: 0,
       selectedArray: []
@@ -131,23 +114,69 @@ export default {
     //分页
     handleCurrentChange(val) {
       this.page = val;
-      // this.getUsers();
+      this.getFileList();
     },
     handleSizeChange(val) {
       this.size = val;
-      // this.getUsers();
+      this.getFileList();
     },
-    getFileList() {
+    //获取列表
+    getFileList(keyword) {
       this.http.post(
-        this.port.mold.moldFileListAll,
-        {},
+        this.port.mold.moldFileDowloadList,
+        {
+          keyName: keyword,
+          pageSize: this.size,
+          pageNum: this.page
+        },
         res => {
           if (res.code == "ok") {
             this.$message({
               message: "安排上了",
               type: "success"
             });
-            console.log(res);
+            this.documents = res.data.list;
+            //对于拿到的所有数据
+            this.documents.forEach(file => {
+              var mould2DFilesState = true;
+              var mould3DFilesState = true;
+              var sparepart2DFilesState = true;
+              var sparepart3DFilesState = true;
+              var maintainFilesState = true;
+              //看看每种文档中的所有文件
+              file.mould2DFiles.forEach(item => {
+                if (item.state != 3) {
+                  mould2DFilesState = false;
+                }
+              });
+              file.mould3DFiles.forEach(item => {
+                if (item.state != 3) {
+                  mould3DFilesState = false;
+                }
+              });
+              file.sparepart2DFiles.forEach(item => {
+                if (item.state != 3) {
+                  sparepart2DFilesState = false;
+                }
+              });
+              file.sparepart3DFiles.forEach(item => {
+                if (item.state != 3) {
+                  sparepart3DFilesState = false;
+                }
+              });
+              file.maintainFiles.forEach(item => {
+                if (item.state != 3) {
+                  maintainFilesState = false;
+                }
+              });
+              //把计算好的状态装进这个模具对象中
+              file.mould2DFilesState = mould2DFilesState;
+              file.mould3DFilesState = mould3DFilesState;
+              file.sparepart2DFilesState = sparepart2DFilesState;
+              file.sparepart3DFilesState = sparepart3DFilesState;
+              file.maintainFilesState = maintainFilesState;
+            });
+            // console.log(this.documents);
           } else {
             this.$message({
               message: res.msg,
@@ -203,7 +232,7 @@ export default {
     this.tableHeight = height - 210;
   },
   mounted() {
-    // this.getFileList();
+    this.getFileList();
   }
 };
 </script>