修改模具筛选

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

@@ -1,8 +1,10 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.ProjectApprove;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.ProjectApproveMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.ProjectApproveService;
@@ -23,10 +25,26 @@ public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper,
     ProjectApproveMapper projectApproveMapper;
     @Resource
     UserMapper userMapper;
+    @Resource
+    CompanyMapper companyMapper;
 
     @Override
     public HttpRespMsg setUpExamine(ProjectApprove projectApprove, String token) {
-        userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl",token));
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        if(user != null){
+            if(Constant.SYS_ID == user.getParentId()){
+                //资产方管理员
+                User examiner = userMapper.selectById(projectApprove.getApproverId());
+
+                projectApprove.setApproverName(examiner.getUsername());
+                projectApprove.setCompanyId(examiner.getCompanyId());
+            }else{
+                msg.setError("对不起，您没有操作该功能的权限");
+            }
+        }else{
+            msg.setError("用户未登录或不存在");
+        }
         return null;
     }
 }

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

@@ -74,7 +74,7 @@
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
-        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hillNumber hillNumber,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
         from
         tb_mould tbm
@@ -107,9 +107,9 @@
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name
-        projectName,tbm.initial_modulus initial_modulus,tbc.company_name companyName,
+        projectName,tbm.initial_modulus initial_modulus,tbc.company_name companyName,tbmp.hillNumber hillNumber,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no
-        equipmentNo,tbm.setting_life setting_life
+        equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
         from
         tb_mould tbm
         left join