From 6a58a5a148c27c9ff66901bfbae6e52c1a56b5d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 17:17:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
index 6d4b85e..743d69a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
@@ -1,15 +1,13 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.HeTask;
-import com.smartor.domain.HeTaskVO;
-import com.smartor.domain.PatArchiveReq;
-import com.smartor.domain.PatHetaskRelevanceVO;
+import com.ruoyi.common.utils.PageUtils;
+import com.smartor.domain.*;
import com.smartor.service.IHeTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,7 +15,6 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -39,9 +36,9 @@
@ApiOperation("鏌ヨ鎮ｈ�呭鏁欎换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('system:task:list')")
@PostMapping("/getPatHeTaskList")
- public TableDataInfo getPatHeTaskList(@RequestBody PatHetaskRelevanceVO patHetaskRelevanceVO) {
+ public TableDataInfo getPatHeTaskList(@RequestBody PatTaskRelevanceVO PatTaskRelevanceVO) {
startPage();
- List<PatHetaskRelevanceVO> list = heTaskService.selectHeTaskList(patHetaskRelevanceVO);
+ List<PatTaskRelevanceVO> list = heTaskService.selectHeTaskList(PatTaskRelevanceVO);
return getDataTable(list);
}
@@ -68,14 +65,14 @@
}
/**
- * 鏂板瀹ｆ暀浠诲姟
+ * 鏂板鎴栦慨鏀瑰垹闄ゅ鏁欎换鍔�
*/
- @ApiOperation("鏂板瀹ｆ暀浠诲姟(鍙戦�佷换鍔�)")
+ @ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ鏁欎换鍔�")
@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "瀹ｆ暀浠诲姟", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- public AjaxResult add(@RequestBody HeTaskVO heTaskVO) {
- return toAjax(heTaskService.insertHeTask(heTaskVO));
+ @PostMapping("/insertOrUpdateHeTask")
+ public AjaxResult insertOrUpdateHeTask(@RequestBody HeTaskVO heTaskVO) {
+ return toAjax(heTaskService.insertOrUpdateHeTask(heTaskVO));
}
/**
@@ -106,8 +103,15 @@
@ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
@PostMapping("/getPatientInfo")
public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
- return getDataTable(heTaskService.getPatientInfo(patArchiveReq));
+ PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ List<PatTaskRelevance> patientInfo = heTaskService.getPatientInfo(patArchiveReq);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ heTaskService.getPatientInfo(patArchiveReq);
+ }
+ });
+ return getDataTable2(count, patientInfo);
}
-
}
--
Gitblit v1.9.3