Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java

@@ -149,6 +149,8 @@ public class BmProjectLot {
     private String address;
     @ApiModelProperty(value = "省份")
     private String province;
+    @ApiModelProperty(value = "省份后地址")
+    private String detailsAddress;
 
     /** 导出选中列表 */
     private List<Long> dataCondition;

sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--<include refid="bmProjectInfo"/>-->
         select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share,
         a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date,
-        a.longitude,a.latitude,a.address,a.province
+        a.longitude,a.latitude,a.address,a.province,a.details_address
         from bm_project_lot a
         left join sys_dept b on a.dept_id = b.dept_id
         left join sys_dic c on a.type_id = c.id
@@ -122,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="latitude != null and latitude != ''">latitude,</if>
             <if test="address != null and address != ''">address,</if>
             <if test="province != null and province != ''">province,</if>
+            <if test="detailsAddress != null and detailsAddress != ''">details_address,</if>
             create_time
         )values(
 			<if test="lotName != null and lotName != ''">#{lotName},</if>
@@ -143,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="latitude != null and latitude != ''">#{latitude},</if>
             <if test="address != null and address != ''">#{address},</if>
             <if test="province != null and province != ''">#{province},</if>
+            <if test="detailsAddress != null and detailsAddress != ''">#{detailsAddress},</if>
             sysdate()
 		)
     </insert>
@@ -167,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
             <if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
             <if test="address != null and address != ''">address = #{address},</if>
+            <if test="detailsAddress != null and detailsAddress != ''">details_address = #{detailsAddress},</if>
             update_time = sysdate()
         </set>
         where lot_id = #{lotId}

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml

@@ -90,29 +90,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <!--设备类型树-->
     <select id="getDeviceTypeTree" resultType="com.bonus.sgzb.system.domain.TreeNode">
-        SELECT type_id AS id,
+        SELECT mt.type_id AS id,
-               type_name AS label,
+        mt.type_name AS label,
-               parent_id AS parentId,
+        mt.parent_id AS parentId,
-               unit_name AS unitName,
+        mt.unit_name AS unitName,
-               company_id AS companyId,
+        mt.company_id AS companyId,
-               code,
+        mt.code,
-               num,
+        CASE mt.manage_type
-               model_code AS modelCode,
+        WHEN 0 THEN
-               manage_type AS manageType
+        IFNULL(subquery0.num, 0)
-        FROM ma_type
+        ELSE
-        WHERE del_flag = '0'
+        IFNULL(mt.num, 0)
+        END as num,
+        mt.model_code AS modelCode,
+        mt.manage_type AS manageType
+        FROM ma_type mt
+        left join (SELECT mt.type_id,
+        mt2.type_name AS             typeName,
+        mt.type_name  AS             typeModelName,
+        count(mm.ma_id) num
+        FROM ma_machine mm
+        LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+        WHERE mm.ma_code is not null and mm.ma_status in (15)
+        GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id
+        WHERE mt.del_flag = '0'
         <if test="level!=null and level!=''">
             <if test="level == 2">
-                AND level IN ('1','2')
+                AND mt.level IN ('1','2')
             </if>
             <if test="level == 3">
-                AND level IN ('1','2','3')
+                AND mt.level IN ('1','2','3')
             </if>
             <if test="level == 4">
-                AND level IN ('1','2','3','4')
+                AND mt.level IN ('1','2','3','4')
             </if>
         </if>
-        ORDER BY create_time
+        ORDER BY mt.create_time
     </select>
     <!--资产属性-->
     <select id="getAssetAttributesCbx" resultType="com.bonus.sgzb.system.domain.SelectVo">