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
f2028451
Commit
f2028451
authored
Jan 24, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
02445729
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
9 deletions
+14
-9
FireFightingSystemController.java
...dule/ccs/biz/controller/FireFightingSystemController.java
+2
-2
FireFightingSystemServiceImpl.java
...e/ccs/biz/service/impl/FireFightingSystemServiceImpl.java
+7
-2
EquipmentManageServiceImpl.java
.../equipmanage/service/impl/EquipmentManageServiceImpl.java
+5
-5
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireFightingSystemController.java
View file @
f2028451
...
...
@@ -95,7 +95,7 @@ public class FireFightingSystemController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"消防系统信息列表全部数据查询"
,
notes
=
"消防系统信息列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
FireFightingSystemDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
fireFightingSystemServiceImpl
.
queryForFireFightingSystemList
());
public
ResponseModel
<
List
<
FireFightingSystemDto
>>
selectForList
(
String
bizOrgCode
)
{
return
ResponseHelper
.
buildResponse
(
fireFightingSystemServiceImpl
.
queryForFireFightingSystemList
(
bizOrgCode
));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireFightingSystemServiceImpl.java
View file @
f2028451
...
...
@@ -4,9 +4,13 @@ import com.yeejoin.amos.boot.module.ccs.api.entity.FireFightingSystem;
import
com.yeejoin.amos.boot.module.ccs.api.mapper.FireFightingSystemMapper
;
import
com.yeejoin.amos.boot.module.ccs.api.service.IFireFightingSystemService
;
import
com.yeejoin.amos.boot.module.ccs.api.dto.FireFightingSystemDto
;
import
org.typroject.tyboot.core.rdbms.annotation.Condition
;
import
org.typroject.tyboot.core.rdbms.annotation.Operator
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
javax.ws.rs.OPTIONS
;
import
java.util.List
;
/**
...
...
@@ -27,7 +31,7 @@ public class FireFightingSystemServiceImpl extends BaseService<FireFightingSyste
/**
* 列表查询 示例
*/
public
List
<
FireFightingSystemDto
>
queryForFireFightingSystemList
()
{
return
this
.
queryForList
(
""
,
false
);
public
List
<
FireFightingSystemDto
>
queryForFireFightingSystemList
(
@Condition
(
Operator
.
like
)
String
bizOrgCode
)
{
return
this
.
queryForList
(
""
,
false
,
bizOrgCode
);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
View file @
f2028451
...
...
@@ -80,13 +80,13 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
Map
map
=
new
HashMap
<
String
,
Object
>();
List
<
EquipmentManageVo
>
utils
=
equipmentManageMapper
.
getUtils
();
List
<
DynamicFormGroup
>
list
=
iEqDynamicFormGroupService
.
list
(
new
LambdaQueryWrapper
<
DynamicFormGroup
>()
.
eq
(
DynamicFormGroup:
:
getOrgCode
,
orgCode
)
/*
List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
//
.eq(DynamicFormGroup::getOrgCode, orgCode)
.eq(DynamicFormGroup::getParentId, 0)
.
orderByDesc
(
BaseEntity:
:
getCreateDate
));
//
List<EquipmentManageVo> systemList = equipmentManageMapper.getSystemList();
.orderByDesc(BaseEntity::getCreateDate));
*/
List
<
EquipmentManageVo
>
systemList
=
equipmentManageMapper
.
getSystemList
();
map
.
put
(
"utils"
,
utils
);
map
.
put
(
"systemType"
,
l
ist
);
map
.
put
(
"systemType"
,
systemL
ist
);
return
map
;
}
...
...
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