add

定时补偿

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusClinicController.java

@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.core.enums.ExportType;
 import com.nb.core.result.ExportResult;
 import com.nb.web.api.entity.*;
@@ -31,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
@@ -276,4 +278,17 @@ public class BusClinicController {
     public R<ExportResult> exportExcel(@RequestBody Collection<String> clinicId) throws IOException {
         return R.success(ExportResult.of("驼人镇痛泵手术（评价）信息列表",clinicService.exportExcelSourceListBase64(clinicId), ExportType.EXCEL));
     }
+
+    @PostMapping("/list/export/excel/")
+    @ApiOperation(value = "导出临床数据查询结果的excel",notes = "导出临床数据查询结果的excel,权限【无】")
+    public R<ExportResult> exportListExcel(@RequestBody@Validated ClinicQuery query) throws IOException {
+        Page<ClinicResult> page = query.getPage();
+        page.setSize(9999);
+        page.setCurrent(1);
+        IPage<ClinicResult> result = clinicService.pageQuery(query);
+        List<String> clinicIds = result.getRecords().stream()
+                .map(ClinicResult::getClinicId)
+                .collect(Collectors.toList());
+        return R.success(ExportResult.of("驼人镇痛泵手术（评价）信息列表",clinicService.exportExcelSourceListBase64(clinicIds), ExportType.EXCEL));
+    }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusClinicService.java

@@ -335,7 +335,8 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
             return ExportExcelUtils.exportClinicExcelBase64(result);
         }
         List<BusClinicEntity> clinicList = this.baseMapper.selectList(new LambdaQueryWrapper<BusClinicEntity>()
-                .in(BusClinicEntity::getId, clinicIds));
+                .in(BusClinicEntity::getId, clinicIds)
+                .orderByDesc(BusClinicEntity::getStartTime));
         if(CollectionUtil.isEmpty(clinicList)){
             return ExportExcelUtils.exportClinicExcelBase64(result);
         }