Commit 12f74ed2 authored by KeYong's avatar KeYong

修改消防坦克装备分类

parent a4ec6565
//package com.yeejoin.amos.knowledgebase.config;
//
//import com.baomidou.mybatisplus.core.toolkit.Sequence;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
///**
// * @author 杨博超
// * @ClassName Config
// * @Deacription TODO
// **/
//@Configuration
//public class Config {
//
// @Bean
// public Sequence sequence() {
// return new Sequence();
// }
//}
......@@ -1139,15 +1139,15 @@
</sql>
</changeSet>
<changeSet author="keyong" id="168623588">
<changeSet author="keyong" id="168623599">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="wl_equipment_category" />
</not>
<tableExists tableName="wl_car" />
</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);
alter table `wl_car` add column `max_speed` double(20) 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>
</databaseChangeLog>
\ No newline at end of file
......@@ -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( '21030000', '%' ) LIMIT 1 ), '') AS icon,
'2103' as code
IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '72000000', '%' ) LIMIT 1 ), '') AS icon,
'7200' 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 ) = '2103'
LEFT ( wec.`code`, 4 ) = '7200'
<if test="bizOrgCode != null and bizOrgCode != ''">
AND wc.biz_org_code like concat (#{bizOrgCode},'%')
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment