Commit c864026b authored by lisong's avatar lisong

修改bug

parent 1ae85dd0
...@@ -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 equipList(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode, public ResponseModel iotMonthReport(@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) {
......
...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment