修改模具筛选

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

@@ -21,17 +21,19 @@ public class ProjectApproveController {
 
     @Autowired
     private ProjectApproveService projectApproveService;
-//        /**
-//     * 设置审批人
-//     * 参数: token 用户身份凭证,approverId 审批人id,approverName 审批人名字
-//     * @return
-//     */
-//    @ApiOperation("设置审批人")
-//    @RequestMapping("/setUpExamine")
-//    @ResponseBody
-//    public HttpRespMsg setUpExamine(ProjectApprove projectApprove){
-//
-//    }
+    /**
+     * 设置审批人
+     * 参数: token 用户身份凭证,approverId 审批人id,projectId 项目名
+     * @return
+     */
+    @ApiOperation("设置审批人")
+    @RequestMapping("/setUpExamine")
+    @ResponseBody
+    public HttpRespMsg setUpExamine(ProjectApprove projectApprove,String token){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = projectApproveService.setUpExamine(projectApprove,token);
+        return msg;
+    }
 
 }
 

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

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.ProjectApprove;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 
 /**
  * @author 吴涛涛
@@ -9,4 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ProjectApproveService extends IService<ProjectApprove> {
 
+    HttpRespMsg setUpExamine(ProjectApprove projectApprove, String token);
 }

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

@@ -1,9 +1,13 @@
 package com.hssx.cloudmodel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.ProjectApprove;
+import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.ProjectApproveMapper;
+import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.ProjectApproveService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -17,4 +21,12 @@ public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper,
 
     @Resource
     ProjectApproveMapper projectApproveMapper;
+    @Resource
+    UserMapper userMapper;
+
+    @Override
+    public HttpRespMsg setUpExamine(ProjectApprove projectApprove, String token) {
+        userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl",token));
+        return null;
+    }
 }

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

@@ -93,10 +93,10 @@
             <if test="userVO.parentId != 0">
                 tbm.company_id = #{userVO.companyId}
             </if>
-            <if test="userVO.searchType == 0">
+            <if test="userVO.searchType == 0 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>
-            <if test="userVO.searchType == 1">
+            <if test="userVO.searchType == 1 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
             </if>
             <if test="userVO.projectId != -1">
@@ -125,10 +125,10 @@
         on
         tbc.id = tbm.company_id
         <where>
-            <if test="userVO.searchType == 0">
+            <if test="userVO.searchType == 0 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
             </if>
-            <if test="userVO.searchType == 1">
+            <if test="userVO.searchType == 1 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
             </if>
             AND tbm.project_id in