From 1f4569eebff6894a1dff3cf2bb205e0cf839f449 Mon Sep 17 00:00:00 2001
From: yxh <17293325@qq.com>
Date: 星期四, 16 四月 2026 14:13:17 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index e441a2f..55e5c2f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -10,6 +11,7 @@
import com.ruoyi.project.domain.ServiceMedicalevaluation;
import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
+import com.ruoyi.project.domain.vo.ServiceMedicalevaluationVO;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceMedicalevaluationService;
import io.swagger.annotations.Api;
@@ -30,7 +32,7 @@
* @date 2021-11-19
*/
@Slf4j
-@Api(description = "鍖荤枟璇勪及绠＄悊")
+@Api(description = "鍖荤枟璇勪及绠＄悊",tags = {"鎹愮尞鍖诲璇勪及"})
@RestController
@RequestMapping("/project/medicalevaluation")
public class ServiceMedicalevaluationController extends BaseController {
@@ -57,17 +59,17 @@
*/
@ApiOperation("鑾峰彇鍖荤枟璇勪及鎮ｈ�呭熀鏈俊鎭垪琛�")
//// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
- @PostMapping("/evaluateBaseInfolist")
- public Map<String, Object> evaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
+ @PostMapping("/medevaluateBaseInfolist")
+ public Map<String, Object> medevaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
Integer offset = PageUtils.getOffset(medicalEvaluationWithBaseInfoVO.getPageNum(), medicalEvaluationWithBaseInfoVO.getPageSize());
medicalEvaluationWithBaseInfoVO.setPageNum(offset);
- List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
+ List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.medevaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
//鑾峰彇鎬绘暟
medicalEvaluationWithBaseInfoVO.setPageNum(null);
medicalEvaluationWithBaseInfoVO.setPageSize(null);
Integer totalCount = 0;
- List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
+ List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.medevaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
return getDataTable(medicalEvaluationWithBaseInfoVOS, totalCount);
}
@@ -100,13 +102,18 @@
* 鏂板鍖诲璇勪及
*/
@ApiOperation("鏂板鍖诲璇勪及")
- //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
- @Log(title = "鍖诲璇勪及", businessType = BusinessType.INSERT)
+ @UniqueCheck(
+ fields = {"infoid"},
+ entityClass = ServiceMedicalevaluation.class,
+ serviceClass = IServiceMedicalevaluationService.class,
+ message = "鏂板鍖诲璇勪及鐨刬nfoid宸插瓨鍦�,鏃犳硶淇濆瓨!"
+ )
@PostMapping("/add")
// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
- public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
- boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
- return AjaxResult.success(serviceMedicalevaluation);
+ public AjaxResult add(@RequestBody ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
+ log.info("鏂板鍖诲璇勪及鐨刬nfoid涓猴細{}",serviceMedicalevaluationVO.getInfoid());
+ boolean save = serviceMedicalevaluationService.add(serviceMedicalevaluationVO);
+ return AjaxResult.success(save);
}
/**
@@ -117,13 +124,10 @@
@Log(title = "鍖诲璇勪及", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
- public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
- List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
- if (CollectionUtils.isEmpty(list)) {
- return error("鍖诲璇勪及鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
- }
- serviceMedicalevaluation.setId(list.get(0).getId());
- return toAjax(serviceMedicalevaluationService.updateById(serviceMedicalevaluation));
+ public AjaxResult edit(@RequestBody ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
+ log.info("淇敼鍖诲璇勪及鐨勪富閿负锛歿}",serviceMedicalevaluationVO.getId());
+ Boolean edit = serviceMedicalevaluationService.edit(serviceMedicalevaluationVO);
+ return toAjax(edit);
}
/**
--
Gitblit v1.9.3