修改管理人员统计bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1510,7 +1510,7 @@ LEFT JOIN (
                             ) g ON u.sequence_nbr = g.instance_id
                         WHERE
                             u.biz_org_type = 'person'
-                          AND g.peopleType IN ('1601', '1602', '1603')
+                          AND g.peopleType IN ('1601', '1602', '1603', '1604')
                           AND u.is_delete = 0
                          <if test="bizOrgCode != null and bizOrgCode != ''">
                             AND  u.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
@@ -1525,6 +1525,8 @@ LEFT JOIN (
                         LEFT JOIN ( SELECT * FROM cb_data_dictionary WHERE type = 'XFGLGW' ) b ON LOCATE( b.CODE, a.fireManagementPost ) != 0
                 WHERE
                     a.sequenceNbr IS NOT NULL AND b.`name` IS NOT NULL
+                GROUP BY
+                    sequenceNbr
             ) a
         GROUP BY
             postName

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -1145,9 +1145,20 @@
         </preConditions>
         <comment>新增属性数据</comment>
         <sql>
-            alter table `wl_car` add column `max_speed` double(20) DEFAULT NULL COMMENT '速度阈值';
+            alter table `wl_car` add column `max_speed` double(10,2) DEFAULT NULL COMMENT '速度阈值';
             alter table `wl_car` add column `phone` varchar(50) DEFAULT NULL COMMENT '联系电话';
             alter table `wl_car` add column `driver` varchar(250) DEFAULT NULL COMMENT '司机';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="168623588">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_equipment_category" />
+        </preConditions>
+        <comment>新增属性数据</comment>
+        <sql>
+            INSERT INTO `wl_equipment_category`(`id`, `parent_id`, `code`, `name`, `is_consumptive`, `description`, `remark`, `create_date`, `industry_code`, `image`) VALUES (860, '123', '21030000', '消防坦克', 0, NULL, '初始导入', '2024-05-23 15:59:42', '2', NULL);
+            DELETE FROM `wl_equipment_category` WHERE id = 759;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/CarPropertyMapper.xml

@@ -134,14 +134,14 @@
                     '消防坦克' AS `name`,
                     count( 1 ) AS `value`,
                     '辆' AS unit,
-                    IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '72000000', '%' ) LIMIT 1 ), '') AS icon,
-                    '7200' as code
+                    IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '21030000', '%' ) LIMIT 1 ), '') AS icon,
+                    '2103' as code
                 FROM
                     `wl_car` wc
                     LEFT JOIN wl_equipment we ON we.`id` = wc.equipment_id
                     LEFT JOIN wl_equipment_category wec ON wec.id = we.category_id
                 WHERE
-                    LEFT ( wec.`code`, 4 ) = '7200'
+                    LEFT ( wec.`code`, 4 ) = '2103'
                     <if test="bizOrgCode != null and bizOrgCode != ''">
                         AND wc.biz_org_code like concat (#{bizOrgCode},'%')
                     </if>