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
c864026b
Commit
c864026b
authored
Oct 09, 2022
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
1ae85dd0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ConfigureController.java
...m/yeejoin/equipmanage/controller/ConfigureController.java
+1
-1
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @
c864026b
...
@@ -632,7 +632,7 @@ public class ConfigureController extends AbstractBaseController {
...
@@ -632,7 +632,7 @@ public class ConfigureController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/iotMonthReport"
)
@GetMapping
(
value
=
"/iotMonthReport"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"物联报表-月"
,
notes
=
"物联报表-月"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"物联报表-月"
,
notes
=
"物联报表-月"
)
public
ResponseModel
equipLis
t
(
@RequestParam
(
value
=
"bizOrgCode"
,
required
=
false
)
String
bizOrgCode
,
public
ResponseModel
iotMonthRepor
t
(
@RequestParam
(
value
=
"bizOrgCode"
,
required
=
false
)
String
bizOrgCode
,
@RequestParam
(
value
=
"startDate"
)
String
startDate
,
@RequestParam
(
value
=
"startDate"
)
String
startDate
,
@RequestParam
(
value
=
"endDate"
)
String
endDate
)
{
@RequestParam
(
value
=
"endDate"
)
String
endDate
)
{
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
c864026b
...
@@ -3621,7 +3621,7 @@
...
@@ -3621,7 +3621,7 @@
wesp.`code` AS num,
wesp.`code` AS num,
ifNull(ed.standard,"") AS type,
ifNull(ed.standard,"") AS type,
ifNull(mi.`name`,"") as manufacturer,
ifNull(mi.`name`,"") as manufacturer,
ifNull(
wws.full_name
,"") as address,
ifNull(
concat(wws.full_name,'--',ed.area)
,"") as address,
ifNull(eq.`name`,"") AS equType,
ifNull(eq.`name`,"") AS equType,
wesp.biz_org_name AS bizOrgName,
wesp.biz_org_name AS bizOrgName,
wesp.id,
wesp.id,
...
...
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