From cac7f142c909d712d6d49c45b0d4efbdef673e48 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 16:25:16 +0800
Subject: [PATCH] 过号 - 检查项目.亲和性
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
index a6c2d15..e4a17eb 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
@@ -1,16 +1,14 @@
package cn.lihu.jh.module.ecg.controller.admin.jobrecord;
+import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordStatisticDO;
import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
@@ -28,6 +26,10 @@
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.service.jobrecord.JobRecordService;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
@Tag(name = "绠＄悊鍚庡彴 - 宸ヤ綔璁板綍")
@RestController
@@ -79,6 +81,18 @@
return success(BeanUtils.toBean(pageResult, JobRecordRespVO.class));
}
+ @GetMapping("/doctor-page")
+ @Operation(summary = "鑾峰緱鐢ㄦ埛鑷繁鐨勫伐浣滆褰曞垎椤�")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<PageResult<JobRecordRespVO>> getJobRecordDoctorPage(@Valid JobRecordPageReqVO pageReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ pageReqVO.setDocId( userId );
+ PageResult<JobRecordDO> pageResult = jobRecordService.getJobRecordPage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, JobRecordRespVO.class));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭宸ヤ綔璁板綍 Excel")
@PreAuthorize("@ss.hasPermission('ecg:job-record:export')")
@@ -92,4 +106,12 @@
BeanUtils.toBean(list, JobRecordRespVO.class));
}
-}
\ No newline at end of file
+ @GetMapping("/job-statistic")
+ @Operation(summary = "宸ヤ綔閲忕粺璁�")
+ @PreAuthorize("@ss.hasPermission('ecg:job-record:statistic')")
+ public CommonResult<List<JobRecordStatisticVO>> getJobStatistic(@Valid JobRecordPageReqVO pageReqVO) {
+ List<JobRecordStatisticDO> statisticDOList = jobRecordService.getJobStatistic(pageReqVO.getJobTime()[0], pageReqVO.getJobTime()[1]);
+ return success(BeanUtils.toBean(statisticDOList, JobRecordStatisticVO.class));
+ }
+}
+
--
Gitblit v1.9.3