浏览代码

模具文档

5 年之前
父节点
当前提交
4db6e74794

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
@@ -125,6 +126,21 @@ public class CompanyController {
         msg.data = list;
         return msg;
     }
+    /**
+     * 生产方公司和公司下所属的模具
+     * 参数 token 用户身份凭证
+     * @return
+     */
+    @ApiOperation(value = "生产方公司和公司下所属的模具")
+    @RequestMapping("/getCoutomCompanyAndMouldsByUser")
+    @ResponseBody
+    public HttpRespMsg getCoutomCompanyAndMouldsByUser(UserVO userVO){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
+        return msg;
+    }
+
+
 
 }
 

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

@@ -4,6 +4,7 @@ import com.hssx.cloudmodel.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -28,4 +29,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg deleteById(Integer id);
 
     List<Company> addCompanyListToProject(User user);
+
+    HttpRespMsg getCoutomCompanyAndMouldsByUser(UserVO userVO);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.LngLatCompanyMapper;
 import com.hssx.cloudmodel.mapper.ProjectMapper;
@@ -139,6 +140,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return companyMapper.selectList(qw);
     }
 
+    @Override
+    public HttpRespMsg getCoutomCompanyAndMouldsByUser(UserVO userVO) {
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        return null;
+    }
+
     @Override
     public HttpRespMsg deleteById(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();

+ 1 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -106,6 +106,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 map.put("update", 1);
                 map.put("download", 1);
                 map.put("view", 1);
+                map.put("approve", 0);
             } else if (vo.getManagerId() == currentUser.getId()) {
                 //当前人是该项目的项目经理
                 Integer approve = 0;

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

@@ -255,6 +255,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("update", 1);
             map.put("download", 1);
             map.put("view", 1);
+            map.put("approve", 0);
         } else if (vo.getManagerId() == currentUser.getId()) {
             //当前人是该项目的项目经理
             Integer approve = 0;