From df3004236c26833f8cc121b42cd890bc56f6a4ff Mon Sep 17 00:00:00 2001
From: zfhai <15856818120@163.com>
Date: Tue, 5 Dec 2023 16:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/controller/MaUpOffController.java |   3 +-
 .../equip/controller/DevInfoController.java   |  12 ++
 .../equip/controller/UpOffController.java     |   6 +-
 .../zlpt/equip/mapper/DevInfoMapper.java      |   2 +-
 .../zlpt/equip/service/IDevInfoService.java   |   4 +
 .../service/impl/DevInfoServiceImpl.java      |  14 +-
 zlpt-modules/zlpt-home/pom.xml                |   5 +
 .../home/controller/MaDevInfoController.java  |   2 +-
 .../controller/MaHotSearchController.java     |  10 +-
 .../home/controller/MaTypeInfoController.java |   8 +-
 .../zlpt/home/mapper/MaDevInfoMapper.java     |   2 +-
 .../zlpt/home/mapper/MaTypeInfoMapper.java    |   1 +
 .../zlpt/home/service/MaDevInfoService.java   |   2 +-
 .../zlpt/home/service/MaTypeInfoSevice.java   |   3 +-
 .../service/impl/MaDevInfoServiceImpl.java    |   2 +-
 .../service/impl/MaTypeInfoServiceImpl.java   |  30 ++++-
 .../main/resources/mapper/MaDevInfoMapper.xml |  24 ++--
 .../resources/mapper/MaTypeInfoMapper.xml     | 124 +-----------------
 18 files changed, 95 insertions(+), 159 deletions(-)

diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java
index 475c445..0ec9635 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java
@@ -1,4 +1,5 @@
 package com.bonus.zlpt.company.controller;
+import cn.hutool.core.lang.tree.Tree;
 import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
 import com.bonus.zlpt.common.core.web.controller.BaseController;
 import com.bonus.zlpt.common.core.web.domain.AjaxResult;
@@ -99,7 +100,7 @@ public class MaUpOffController extends BaseController {
      */
     @PostMapping("/getEquipmentType")
     public TableDataInfo getEquipmentType() {
-        List<TypeInfo> list = maTypeInfoSevice.getMaTypeInfoList();
+        List<Tree<Long>> list = maTypeInfoSevice.getMaTypeInfoList();
         return getDataTable(list);
     }
 
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
index eed53a7..c5d526b 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
@@ -1,6 +1,7 @@
 package com.bonus.zlpt.equip.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto;
 import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
@@ -110,4 +111,15 @@ public class DevInfoController extends BaseController
         return toAjax(devInfoService.insertInforMationDto(inforMationDto));
     }
 
+
+    /**
+     * 统计装备
+     * @return
+     */
+    @GetMapping("/sumType")
+    public AjaxResult sumType()
+    {
+        Map<String, Integer> sumType =devInfoService.sumType();
+        return success(sumType);
+    }
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
index 43d1e72..0915077 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
@@ -119,7 +119,7 @@ public class UpOffController extends BaseController
      * 修改设备上下架管理
 
      */
-    @RequiresPermissions("equip:off:edit")
+    //@RequiresPermissions("equip:off:edit")
     @Log(title = "设备上下架管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody List<UpOff> upOffList)
@@ -144,9 +144,5 @@ public class UpOffController extends BaseController
     }
 
 
-    /**
-     * 批量上下架
-     */
-
 
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
index 8288723..3dad0b7 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
@@ -39,7 +39,7 @@ public interface DevInfoMapper
      * @param devInfo 设备信息
      * @return 设备信息集合
      */
-    public List<DevInfoVo> selectDevInfoList(DevInfo devInfo);
+    public List<DevInfoVo> selectDevInfoList(DevInfoVo devInfo);
 
     /**
      * 新增设备信息
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
index 7a8bee6..126b6c0 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
@@ -1,6 +1,8 @@
 package com.bonus.zlpt.equip.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.bonus.zlpt.common.core.domain.equip.DevInfo;
 import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto;
 import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
@@ -76,4 +78,6 @@ public interface IDevInfoService
      */
     int insertInforMationDto(InforMationDto inforMationDto);
 
+
+    public Map<String, Integer> sumType();
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index 8dec196..a7f8d10 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 
+import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto;
 import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
 
 import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
@@ -124,12 +125,21 @@ public class DevInfoServiceImpl implements IDevInfoService
         return devInfoMapper.deleteDevInfoByMaId(maId);
     }
 
+    @Override
+    public int insertInforMationDto(InforMationDto inforMationDto) {
+        return 0;
+    }
+
+    /**
+     * 统计装备
+     * @return
+     */
     @Override
     public Map<String, Integer> sumType() {
-        DevInfo devInfo = new DevInfo();
+        DevInfoVo devInfoVo = new DevInfoVo();
         Map<String, Integer> sumTypeMap = new IdentityHashMap<>();
         //获取所有的装备信息
-        List<DevInfoVo> devInfoList = devInfoMapper.selectDevInfoList(devInfo);
+        List<DevInfoVo> devInfoList = devInfoMapper.selectDevInfoList(devInfoVo);
         //获取每种状态列表
         Map<String, List<DevInfo>> groupedByMaStatus = devInfoList.stream()
                 .collect(Collectors.groupingBy(DevInfo::getMaStatus));
diff --git a/zlpt-modules/zlpt-home/pom.xml b/zlpt-modules/zlpt-home/pom.xml
index fac8250..02b6f2b 100644
--- a/zlpt-modules/zlpt-home/pom.xml
+++ b/zlpt-modules/zlpt-home/pom.xml
@@ -19,6 +19,11 @@
             <groupId>com.bonus.zlpt</groupId>
             <artifactId>zlpt-common-swagger</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.18</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java
index 3b769a3..3a6b3b6 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java
@@ -29,7 +29,7 @@ public class MaDevInfoController extends BaseController {
      * @return
      */
     @PostMapping("/getEquipmentList")
-    public TableDataInfo getEquipmentList(@Validated @RequestBody DevInfo maDevInfo) {
+    public TableDataInfo getEquipmentList(@Validated @RequestBody DevInfoVo maDevInfo) {
         List<DevInfoVo> list = maDevInfoService.getEquipmentList(maDevInfo);
         return getDataTable(list);
     }
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java
index 0bbb618..b8c28c5 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java
@@ -5,12 +5,10 @@ import com.bonus.zlpt.common.core.web.controller.BaseController;
 import com.bonus.zlpt.common.core.web.page.TableDataInfo;
 import com.bonus.zlpt.home.service.MaHotSearchService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.websocket.server.PathParam;
 import java.util.List;
 
 @RestController
@@ -24,8 +22,8 @@ public class MaHotSearchController extends BaseController {
      * 热搜装备
      * @return
      */
-    @PostMapping("getHotEquipList")
-    public TableDataInfo getHotEquipList(@Validated @RequestBody String more) {
+    @GetMapping("/getHotEquipList")
+    public TableDataInfo getHotEquipList(@PathParam("more")String more) {
         //获取更多
         if (more!=null && more != ""){
             List<DevInfoVo> list = maHotSearchService.getHotEquipList();
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java
index 82dfbd5..91a7273 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java
@@ -1,10 +1,10 @@
 package com.bonus.zlpt.home.controller;
 
-import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
+import cn.hutool.core.lang.tree.Tree;
 import com.bonus.zlpt.common.core.web.controller.BaseController;
 import com.bonus.zlpt.common.core.web.page.TableDataInfo;
 import com.bonus.zlpt.home.service.MaTypeInfoSevice;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,9 +22,9 @@ public class MaTypeInfoController extends BaseController {
      * 搜索分类
      * @return
      */
-    @PostMapping("/getEquipmentType")
+    @GetMapping("/getEquipmentType")
     public TableDataInfo getEquipmentType() {
-        List<TypeInfo> list = maTypeInfoSevice.getMaTypeInfoList();
+        List<Tree<Long>> list = maTypeInfoSevice.getMaTypeInfoList();
         return getDataTable(list);
     }
 
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java
index 09aac6e..c749923 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java
@@ -6,5 +6,5 @@ import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
 import java.util.List;
 
 public interface MaDevInfoMapper {
-    public List<DevInfoVo> getEquipmentList(DevInfo maDevInfo);
+    public List<DevInfoVo> getEquipmentList(DevInfoVo maDevInfo);
 }
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java
index 1f0588e..238a62d 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java
@@ -4,6 +4,7 @@ import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
 
 import java.util.List;
 
+
 public interface MaTypeInfoMapper {
     public List<TypeInfo> getMaTypeInfoList() ;
 
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java
index 6b2b097..eecc586 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java
@@ -6,5 +6,5 @@ import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
 import java.util.List;
 
 public interface MaDevInfoService {
-    public List<DevInfoVo> getEquipmentList(DevInfo maDevInfo);
+    public List<DevInfoVo> getEquipmentList(DevInfoVo maDevInfo);
 }
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java
index abaf80a..d47872a 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java
@@ -1,10 +1,11 @@
 package com.bonus.zlpt.home.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
 
 import java.util.List;
 
 public interface MaTypeInfoSevice {
-    public List<TypeInfo> getMaTypeInfoList();
+    public List<Tree<Long>> getMaTypeInfoList();
 
 }
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java
index f0c2b04..8a2248c 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java
@@ -15,7 +15,7 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
     @Resource
     private MaDevInfoMapper maDevInfoMapper;
     @Override
-    public List<DevInfoVo> getEquipmentList(DevInfo maDevInfo) {
+    public List<DevInfoVo> getEquipmentList(DevInfoVo maDevInfo) {
         return maDevInfoMapper.getEquipmentList(maDevInfo);
     }
 }
diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java
index 5925ada..54028cb 100644
--- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java
@@ -1,5 +1,8 @@
 package com.bonus.zlpt.home.service.impl;
 
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
 import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
 import com.bonus.zlpt.home.mapper.MaTypeInfoMapper;
 import com.bonus.zlpt.home.service.MaTypeInfoSevice;
@@ -10,6 +13,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 public class MaTypeInfoServiceImpl implements MaTypeInfoSevice {
@@ -19,11 +24,12 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice {
 
 
     @Override
-    public List<TypeInfo> getMaTypeInfoList() {
+    public List<Tree<Long>> getMaTypeInfoList() {
         List<TypeInfo> maTypeInfoList = maTypeInfoMapper.getMaTypeInfoList();
-
-        List<TypeInfo> menuTree = buildMenuTree(maTypeInfoList);
-        return menuTree;
+        List<TreeNode<Long>> collect = maTypeInfoList
+                .stream().map(getNodeFunction()).collect(Collectors.toList());
+        //List<TypeInfo> menuTree = buildMenuTree(maTypeInfoList);
+        return TreeUtil.build(collect,0L);
     }
 
 
@@ -39,7 +45,7 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice {
 
         // 将菜单按照父菜单ID分组,放在menuMap中
         for (TypeInfo maTypeInfo : maTypeInfoList) {
-            Long parentId = maTypeInfo.getParentId() != ' ' ? maTypeInfo.getParentId() : 0;
+            Long parentId = maTypeInfo.getParentId() ;
             if (!menuMap.containsKey(parentId)) {
                 menuMap.put(parentId, new ArrayList<>());
             }
@@ -49,7 +55,7 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice {
         // 从根菜单开始，构建菜单树
         rootMenus.addAll(menuMap.getOrDefault(0, new ArrayList<>()));
         System.out.println("rootMenus:   "+rootMenus);
-        for (TypeInfo maTypeInfo : rootMenus) {
+        for (TypeInfo maTypeInfo : maTypeInfoList) {
             buildSubMenuTree(maTypeInfo, menuMap);
         }
 
@@ -70,4 +76,16 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice {
             buildSubMenuTree(maTypeInfoChildren, menuMap);
         }
     }
+
+    private Function<TypeInfo, TreeNode<Long>> getNodeFunction() {
+
+        return typeInfo -> {
+            TreeNode<Long> node = new TreeNode<>();
+            node.setId(typeInfo.getTypeId());
+            node.setName(typeInfo.getTypeName());
+            node.setParentId(typeInfo.getParentId());
+            node.setWeight(typeInfo.getSort());
+            return node;
+        };
+    }
 }
diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml
index 57aaa8f..18cf8a3 100644
--- a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml
+++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml
@@ -39,34 +39,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_dev_info d  left join ma_type_info t on d.type_id = t.type_id
         <where>
             <if test="maId != null and maId != ''">
-                AND ma_id = #{maId}
+                AND d.ma_id = #{maId}
             </if>
             <if test="code != null and code != ''">
-                AND code = #{code}
+                AND d.code = #{code}
             </if>
             <if test="typeId != null and typeId != ''">
-                AND type_id = #{typeId}
+                AND d.type_id = #{typeId}
             </if>
             <if test="maStatus != null and maStatus != ''">
-                AND ma_status = #{maStatus}
+                AND d.ma_status = #{maStatus}
             </if>
             <if test="leaseScope != null and leaseScope != ''">
-                AND lease_scope = #{leaseScope}
+                AND d.lease_scope = #{leaseScope}
             </if>
             <if test="location != null and location != ''">
-                AND location = #{location}
+                AND d.location = #{location}
             </if>
             <if test="brand != null and brand != ''">
-                AND brand = #{brand}
+                AND d.brand = #{brand}
             </if>
             <if test="modelName != null and modelName != ''">
-                AND model_name = #{modelName}
+                AND d.model_name = #{modelName}
             </if>
             <if test="productionDate != null and productionDate != ''">
-                AND production_date = #{productionDate}
+                AND d.production_date = #{productionDate}
             </if>
             <if test="workingHours != null and workingHours != ''">
-                AND working_hours = #{workingHours}
+                AND d.working_hours = #{workingHours}
             </if>
             <if test="serialNumber != null and serialNumber != ''">
                 AND serial_number = #{serialNumber}
@@ -107,6 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isActive != null and isActive != ''">
                 AND is_active = #{isActive}
             </if>
+            <if test="typeName != null and typeName != ''">
+                AND t.type_name like concat('%', #{typeName}, '%')
+            </if>
+
         </where>
     </select>
     
diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml
index c603f21..2721845 100644
--- a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml
+++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.bonus.zlpt.home.mapper.MaDevInfoMapper">
+<mapper namespace="com.bonus.zlpt.home.mapper.MaTypeInfoMapper">
     
-    <resultMap type="com.bonus.zlpt.common.core.domain.equip.DevInfo" id="MaDevInfoResult">
+    <resultMap type="com.bonus.zlpt.common.core.domain.equip.TypeInfo" id="MaDevInfoResult">
 
         <id     property="typeId"      column="type_id"      />
         <result property="parentId"    column="parent_id"    />
@@ -15,129 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="bmProjectInfo">
-        select type_id, parent_id, type_name, level, sort, is_active
+        select type_id, parent_id, type_name, `level`, sort, is_active
 		from ma_type_info
     </sql>
 
-    <select id="getMaTypeInfoList"  resultType="com.bonus.zlpt.common.core.domain.equip.DevInfo">
-        select type_id, parent_id, type_name, level, sort, is_active
+    <select id="getMaTypeInfoList"  resultType="com.bonus.zlpt.common.core.domain.equip.TypeInfo">
+        select type_id, parent_id, type_name, `level`, sort, is_active
         from ma_type_info
     </select>
     
-    <select id="getProjectInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo" resultMap="MaDevInfoResult">
-        select pro_id, pro_name, status, type_id, link_man, telphone, dept_id, del_flag, create_by, create_time,
-        update_by, update_time, remark, company_id
-        from bm_project_info
-        where del_flag = '0'
-			<if test="proId != null and proId != ''">
-				AND pro_id = #{proId}
-			</if>
-			<if test="proName != null and proName != ''">
-                AND pro_name like concat('%', #{proName}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="typeId != null and typeId != ''">
-                AND type_id = #{typeId}
-			</if>
-			<if test="linkMan != null and linkMan != ''">
-				and link_man = #{linkMan}
-			</if>
-            <if test="telphone != null and telphone != ''">
-                and telphone = #{telphone}
-            </if>
-            <if test="deptId != null and deptId != ''">
-                and dept_id = #{deptId}
-            </if>
-            <if test="delFlag != null and delFlag != ''">
-                and del_flag = #{delFlag}
-            </if>
-            <if test="createBy != null and createBy != ''">
-                and create_by = #{createBy}
-            </if>
-            <if test="createTime != null and createTime != ''">
-                and create_time = #{createTime}
-            </if>
-            <if test="updateBy != null and updateBy != ''">
-                and update_by = #{updateBy}
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                and update_time = #{updateTime}
-            </if>
-            <if test="remark != null and remark != ''">
-                and remark = #{remark}
-            </if>
-            <if test="companyId != null and companyId != ''">
-                and company_id = #{companyId}
-            </if>
 
-    </select>
-    
-
-    
-    <insert id="projectInfoAdd" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo">
-        insert into bm_project_info (
-			<if test="proName != null and proName != '' ">pro_name,</if>
-			<if test="status != null and status != '' ">status,</if>
-			<if test="typeId != null and typeId != '' ">type_id,</if>
-			<if test="linkMan != null and linkMan != '' ">link_man,</if>
-			<if test="telphone != null and telphone != ''">telphone,</if>
-			<if test="deptId != null and deptId != ''">dept_id,</if>
-            <if test="delFlag != null and delFlag != ''">del_flag,</if>
-            <if test="createBy != null and createBy != ''">create_by,</if>
-            <if test="updateBy != null and updateBy != ''">update_by,</if>
-            <if test="updateTime != null and updateTime != ''">update_time,</if>
-            <if test="remark != null and remark != ''">remark,</if>
-            <if test="companyId != null and companyId != ''">company_id,</if>
-            create_time
-        )values(
-			<if test="proName != null and proName != ''">#{proName},</if>
-			<if test="status != null and status != ''">#{status},</if>
-			<if test="typeId != null and typeId != ''">#{typeId},</if>
-			<if test="linkMan != null and linkMan != ''">#{linkMan},</if>
-			<if test="telphone != null and telphone != ''">#{telphone},</if>
-			<if test="deptId != null and deptId != ''">#{deptId},</if>
-            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
-            <if test="createBy != null and createBy != ''">#{createBy},</if>
-            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
-            <if test="updateTime != null and updateTime != ''">#{updateTime},</if>
-            <if test="remark != null and remark != ''">#{remark},</if>
-            <if test="companyId != null and companyId != ''">#{companyId},</if>
-            sysdate()
-		)
-    </insert>
-	 
-    <update id="updateBmProjectInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo">
-        update bm_project_info
-        <set>
-            <if test="proName != null and proName != ''">pro_name = #{proName},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="typeId != null and typeId != ''">type_id = #{typeId},</if>
-            <if test="linkMan != null and linkMan != ''">link_man = #{linkMan},</if>
-            <if test="telphone != null and telphone != ''">telphone = #{telphone},</if>
-            <if test="deptId != null and deptId != ''">dept_id = #{deptId},</if>
-            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
-            <if test="createBy != null and createBy != ''">create_by =#{createBy},</if>
-            <if test="createTime != null and createTime != ''">create_time = #{createTime},</if>
-            <if test="updateBy != null and updateBy != ''">update_by =#{updateBy},</if>
-
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
-            <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
-            update_time = sysdate()
-        </set>
-        where pro_id = #{proId}
-    </update>
-	
-    <delete id="deleteProjectInfoById" parameterType="Long">
-        update bm_project_info set del_flag = '2' where pro_id = #{proId}
-    </delete>
-    
-    <delete id="remove" parameterType="Long">
-        delete from bm_project_info where pro_id in
-        <foreach item="proId" collection="array" open="(" separator="," close=")">
-        	#{proId}
-        </foreach>
-    </delete>
     
 </mapper>
\ No newline at end of file