Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
12f74ed2
Commit
12f74ed2
authored
May 28, 2024
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改消防坦克装备分类
parent
a4ec6565
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
27 deletions
+9
-27
Config.java
...in/java/com/yeejoin/amos/knowledgebase/config/Config.java
+0
-19
wl-3.6.0.xml
...ot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
+6
-5
CarPropertyMapper.xml
...tem-equip/src/main/resources/mapper/CarPropertyMapper.xml
+3
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/config/Config.java
deleted
100644 → 0
View file @
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();
// }
//}
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @
12f74ed2
...
...
@@ -1139,15 +1139,15 @@
</sql>
</changeSet>
<changeSet
author=
"keyong"
id=
"1686235
88
"
>
<changeSet
author=
"keyong"
id=
"1686235
99
"
>
<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
amos-boot-system-equip/src/main/resources/mapper/CarPropertyMapper.xml
View file @
12f74ed2
...
...
@@ -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( '
2103
0000', '%' ) LIMIT 1 ), '') AS icon,
'
2103
' as code
IFNULL(( SELECT IFNULL( img, shbz_img ) AS img FROM wl_equipment WHERE `code` LIKE CONCAT( '
7200
0000', '%' ) 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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment