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
ee75a966
Commit
ee75a966
authored
Nov 01, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
运维概览页面 岗位 蓝色背景bug
parent
6eaec4dc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
InputItemController.java
.../amos/patrol/business/controller/InputItemController.java
+6
-0
EquipmentManageMapper.xml
...equip/src/main/resources/mapper/EquipmentManageMapper.xml
+1
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java
View file @
ee75a966
...
...
@@ -555,9 +555,15 @@ public class InputItemController extends AbstractBaseController {
if
(
param
.
getEquipmentType
()
==
null
&&
param
.
getCustomType
()
==
null
&&
param
.
getFacilitiesType
()
==
null
&&
param
.
getKeyPartsType
()
==
null
){
throw
new
BadRequest
(
"适用类型至少需选择一项"
);
}
if
(
CollectionUtils
.
isNotEmpty
(
inputItemDao
.
findByItemNo
(
param
.
getItemNo
())))
{
throw
new
BadRequest
(
"该编号已存在,请重新输入"
);
}
if
(
CollectionUtils
.
isNotEmpty
(
inputItemDao
.
findByItemName
(
param
.
getName
())))
{
throw
new
BadRequest
(
"该名称已存在,请重新输入"
);
}
//如果为1则为否,顺应机场逻辑
param
.
setCustomType
(
"1"
.
equals
(
param
.
getCustomType
())
?
null
:
param
.
getCustomType
());
param
.
setKeyPartsType
(
"1"
.
equals
(
param
.
getKeyPartsType
())
?
null
:
param
.
getKeyPartsType
());
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml
View file @
ee75a966
...
...
@@ -24,6 +24,7 @@
sys.design_org,
sys.lead_designer,
sys.design_org_telephone,
wec.code as categoryCode,
(select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount,
wws.full_name as fullName
from
...
...
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