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
4c913919
Commit
4c913919
authored
Jun 30, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
9bac7b1c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
WaterResourceController.java
...module/common/biz/controller/WaterResourceController.java
+1
-1
JcsFeign.java
...src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java
+1
-1
dbTemplate_plan_task.xml
...nce/src/main/resources/db/mapper/dbTemplate_plan_task.xml
+1
-1
No files found.
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 @
4c913919
...
...
@@ -434,7 +434,7 @@ public class WaterResourceController extends BaseController {
String
classifyId
,
String
bizOrgCode
,
String
equipCateGoryCode
,
List
<
String
>
ids
)
{
@RequestParam
(
value
=
"ids"
,
required
=
false
)
List
<
String
>
ids
)
{
Page
<
WaterResourceDto
>
page
=
new
Page
<>();
page
.
setCurrent
(
pageNum
);
page
.
setSize
(
pageSize
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java
View file @
4c913919
...
...
@@ -43,7 +43,7 @@ public interface JcsFeign {
@RequestParam
(
value
=
"belongFightingSystemId"
)
Long
belongFightingSystemId
,
@RequestParam
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
,
@RequestParam
(
value
=
"classifyId"
)
String
classifyId
,
@RequestParam
(
value
=
"
classifyId
"
)
List
<
String
>
ids
@RequestParam
(
value
=
"
ids
"
)
List
<
String
>
ids
);
@RequestMapping
(
value
=
"/equip/fireSystem_waterResource/list"
,
method
=
RequestMethod
.
GET
,
consumes
=
"application/json"
)
...
...
amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @
4c913919
...
...
@@ -238,7 +238,7 @@
</if>
<choose>
<when
test=
"identityType==1"
>
And (a.orgCode LIKE CONCAT( #{orgCode}, '
-
%' ) or a.orgCode= #{orgCode} )
And (a.orgCode LIKE CONCAT( #{orgCode}, '%' ) or a.orgCode= #{orgCode} )
<if
test=
"companyId != null and companyId != ''"
>
and a.owner_id = #{companyId}
</if>
</when>
<when
test=
"identityType==2"
>
...
...
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