用户创建的修改

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

@@ -89,7 +89,7 @@ public class CompanyController {
     @ApiOperation("创建模具获取的公司列表")
     @RequestMapping("/getCompanys")
     @ResponseBody
-    public HttpRespMsg getcompanys() {
+    public HttpRespMsg getCompanys() {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Company> qw = new QueryWrapper<>();
         qw.eq("company_type",0);

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

@@ -86,12 +86,12 @@ public class MouldEquipmentController {
     @ApiOperation("设备列表")
     @RequestMapping("/getEquipmentList")
     @ResponseBody
-    public HttpRespMsg getMouldEquipmentList(@RequestParam(required = false) String token, PageUtil page,Integer companyId){
+    public HttpRespMsg getMouldEquipmentList(@RequestParam(required = false) String token, PageUtil page,Integer companyId,String keyName){
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("head_imgurl",token);
         User user = userService.getOne(qw);
-        msg = mouldEquipmentService.getList(user,page,companyId);
+        msg = mouldEquipmentService.getList(user,page,companyId,keyName);
         return msg;
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldEquipmentMapper.java

@@ -20,5 +20,5 @@ public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
     List<MouldEquipmentVO> getListByCompanyId(@Param("belongCompanyId") Integer belongCompanyId,@Param("list") List<Integer> ides);
 
-    List<MouldEquipmentVO> getList(@Param("companyId")Integer companyId);
+    List<MouldEquipmentVO> getList(@Param("companyId")Integer companyId,@Param("keyName")String keyName);
 }

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

@@ -21,7 +21,7 @@ public interface MouldEquipmentService extends IService<MouldEquipment> {
 
     HttpRespMsg isUse(MouldEquipment mouldEquipment, User user);
 
-    HttpRespMsg getList(User user,PageUtil page,Integer companyId);
+    HttpRespMsg getList(User user,PageUtil page,Integer companyId,String keyName);
 
     HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO);
 }

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

@@ -85,12 +85,12 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     }
 
     @Override
-    public HttpRespMsg getList(User user, PageUtil page,Integer companyId) {
+    public HttpRespMsg getList(User user, PageUtil page,Integer companyId,String keyName) {
         HttpRespMsg msg = new HttpRespMsg();
         if (user != null) {
             if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
-                List<MouldEquipmentVO> mouldEquipments = mouldEquipmentMapper.getList(companyId);
+                List<MouldEquipmentVO> mouldEquipments = mouldEquipmentMapper.getList(companyId,keyName);
                 PageInfo<MouldEquipmentVO> pageInfo = new PageInfo<>(mouldEquipments);
                 msg.data = pageInfo;
             } else {

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

@@ -71,7 +71,10 @@
           tbme.belong_company_id = tbc.id
         <where>
             <if test="companyId != null">
-                tbme.belong_company_id = #{companyId}
+                and tbme.belong_company_id = #{companyId}
+            </if>
+            <if test="keyName != null and keyName != ''">
+                and tbme.equipment_no like concat('%',#{keyName},'%');
             </if>
         </where>
     </select>