#两票月度统计导出

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/controller/ScheduledController.java

@@ -1,35 +0,0 @@
-package com.hnac.hzims.scheduled.controller;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.hnac.hzims.scheduled.service.operation.monitor.MonitorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.log.annotation.ApiLog;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author ysj
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/scheduled")
-@Api(value = "定时任务", tags = "定时任务")
-public class ScheduledController {
-
-    private final MonitorService service;
-
-    @ApiLog
-    @ApiOperation("集中监控数据加载")
-    @GetMapping("/loadMonitoring")
-    @ApiOperationSupport(order = 1)
-    public R duty(@ApiParam(value = "机构Id", required = true) @RequestParam Long deptId) {
-        service.loadMonitoring("2023-10-19");
-        return R.status(true);
-    }
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java

@@ -451,6 +451,7 @@ public class MonitorServiceImpl implements MonitorService {
      * @param item
      */
     private void stationParam(List<StationEntity> stationEntityList, RealStationVo item,List<Dept> deptAll) {
+        item.setSort(9999);
         if(CollectionUtil.isEmpty(stationEntityList)){
             return;
         }
@@ -466,7 +467,6 @@ public class MonitorServiceImpl implements MonitorService {
         item.setWaterLevelMax(Optional.ofNullable(station.getLimitWaterLevel()).orElse(0.0));
         item.setServerType(station.getServeType());
         item.setStationDeptId(station.getRefDept());
-        item.setSort(9999);
         // 排序
         List<Dept> list = deptAll.stream().filter(o-> station.getRefDept().equals(o.getId())).collect(Collectors.toList());
         if(CollectionUtil.isEmpty(list)){

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/CensServiceImpl.java

@@ -395,9 +395,6 @@ public class CensServiceImpl implements CensService {
             // 操作票数量
             HSSFCell header_row_cell_3 = row.getCell(3);
             header_row_cell_3.setCellValue(cens.getOperateCount());
-            // 工作任务数量
-            HSSFCell header_row_cell_4 = row.getCell(4);
-            header_row_cell_4.setCellValue(cens.getWorkTaskCount());
         }
     }