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
d2fc740c
Commit
d2fc740c
authored
Jan 04, 2022
by
高建强
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_ccs' into develop_ccs
parents
37adfa43
0ff3f829
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
9 deletions
+32
-9
WaterResourceMapper.java
...os/boot/module/common/api/mapper/WaterResourceMapper.java
+3
-3
WaterResourceMapper.xml
...mon-api/src/main/resources/mapper/WaterResourceMapper.xml
+4
-3
WaterResourceController.java
...module/common/biz/controller/WaterResourceController.java
+3
-2
WaterResourceServiceImpl.java
...ule/common/biz/service/impl/WaterResourceServiceImpl.java
+0
-0
WarehouseStructureController.java
.../equipmanage/controller/WarehouseStructureController.java
+8
-0
IWarehouseStructureService.java
...ejoin/equipmanage/service/IWarehouseStructureService.java
+1
-1
WarehouseStructureServiceImpl.java
...uipmanage/service/impl/WarehouseStructureServiceImpl.java
+13
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java
View file @
d2fc740c
...
...
@@ -47,7 +47,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
*/
Page
<
WaterResourceDto
>
getWaterResourcePageByParams
(
Page
<
WaterResourceDto
>
page
,
String
name
,
String
resourceType
,
ArrayList
<
Long
>
belongBuildingId
,
Long
belongFightingSystemId
,
Long
sequenceNbr
,
String
equipId
,
String
bizOrgCode
);
Map
<
String
,
Object
>
getWaterTypeByBizOrgCode
(
String
bizOrgCode
);
Long
sequenceNbr
,
String
equipId
,
String
bizOrgCode
,
String
equipCateGoryCode
);
List
<
Map
<
String
,
Object
>
>
getWaterTypeByBizOrgCode
(
String
bizOrgCode
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml
View file @
d2fc740c
...
...
@@ -134,6 +134,7 @@
select * from cb_water_resource where is_delete = 1
<if
test=
"sequenceNbr != null and sequenceNbr != ''"
>
and sequence_nbr = #{sequenceNbr}
</if>
<if
test=
"resourceType != null and resourceType != ''"
>
and resource_type = #{resourceType}
</if>
<if
test=
"equipCateGoryCode != null and equipCateGoryCode != ''"
>
and equip_category_code = #{equipCateGoryCode}
</if>
<if
test=
"equipId != null and equipId != ''"
>
and equip_id = #{equipId}
</if>
<if
test=
"name != null and name != ''"
>
and name like concat('%', #{name}, '%')
</if>
<if
test=
"belongFightingSystemId != null"
>
...
...
@@ -152,15 +153,15 @@
</select>
<select
id=
"getWaterTypeByBizOrgCode"
resultType=
"map"
>
SELECT
equip_category_cod
e,
equip_category_code typ
e,
COUNT(sequence_nbr) as num
FROM
cb_water_resource
WHERE
is_delete =
0
is_delete =
1
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
AND biz_org_code like concat( #{bizOrgCode}, '%')
</if>
GROUP BY
equip_category_code
equip_category_code
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @
d2fc740c
...
...
@@ -465,14 +465,15 @@ public class WaterResourceController extends BaseController {
Long
belongFightingSystemId
,
Long
sequenceNbr
,
String
resourceType
,
String
classifyId
,
String
bizOrgCode
)
{
String
bizOrgCode
,
String
equipCateGoryCode
)
{
Page
<
WaterResourceDto
>
page
=
new
Page
<>();
page
.
setCurrent
(
pageNum
);
page
.
setSize
(
pageSize
);
/*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
Page
<
WaterResourceDto
>
waterResourceDtoPage
=
waterResourceServiceImpl
.
queryForWaterResourcePage
(
page
,
name
,
resourceType
,
belongBuildingId
,
belongFightingSystemId
,
sequenceNbr
,
classifyId
,
bizOrgCode
);
belongBuildingId
,
belongFightingSystemId
,
sequenceNbr
,
classifyId
,
bizOrgCode
,
equipCateGoryCode
);
List
<
WaterResourceDto
>
records
=
waterResourceDtoPage
.
getRecords
();
records
.
forEach
(
i
->{
Map
<
String
,
List
<
AttachmentDto
>>
attachments
=
sourceFileService
.
getAttachments
(
i
.
getSequenceNbr
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java
View file @
d2fc740c
This diff is collapsed.
Click to expand it.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WarehouseStructureController.java
View file @
d2fc740c
...
...
@@ -177,6 +177,14 @@ public class WarehouseStructureController extends AbstractBaseController {
return
iWarehouseStructureService
.
tree
(
id
);
}
@RequestMapping
(
value
=
"/gettree/{id}"
,
method
=
RequestMethod
.
GET
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"树查询"
,
notes
=
"树查询"
)
public
List
<
WarehouseStructure
>
gettree
(
@PathVariable
Long
id
,
String
bizOrgCode
)
{
return
iWarehouseStructureService
.
gettree
(
id
,
bizOrgCode
);
}
/**
* 批量删除
*
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IWarehouseStructureService.java
View file @
d2fc740c
...
...
@@ -17,7 +17,7 @@ public interface IWarehouseStructureService extends IService<WarehouseStructure>
WarehouseStructure
saveOne
(
WarehouseStructure
warehouseStructure
);
List
<
WarehouseStructure
>
tree
(
Long
warehouseId
);
List
<
WarehouseStructure
>
gettree
(
Long
warehouseId
,
String
bizOrgCode
);
WarehouseStructure
updateOneById
(
WarehouseStructure
warehouseStructure
);
boolean
removeOneById
(
Long
id
)
throws
Exception
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WarehouseStructureServiceImpl.java
View file @
d2fc740c
...
...
@@ -6,6 +6,7 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.Map
;
import
com.yeejoin.equipmanage.common.entity.FormInstance
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -63,6 +64,18 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
return
list
;
}
@Override
public
List
<
WarehouseStructure
>
gettree
(
Long
warehouseId
,
String
bizOrgCode
)
{
QueryWrapper
<
WarehouseStructure
>
one
=
new
QueryWrapper
<>();
one
.
eq
(
"warehouse_id"
,
warehouseId
);
one
.
likeRight
(
"biz_org_code"
,
bizOrgCode
);
List
<
WarehouseStructure
>
list
=
warehouseStructureMapper
.
selectList
(
one
);
list
=
buildByRecursive
(
list
,
warehouseId
);
return
list
;
}
/**
* 生成code
*
...
...
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