From c225d391b090bf72a7406fbb74484b5509508d24 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 27 二月 2023 16:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
index 23405da..6168678 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
@@ -1,16 +1,18 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
-import com.panzhihua.service_community.service.EldersAuthService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* @author xyh
@@ -24,60 +26,64 @@
@Resource
private ComEldersAuthElderlyService comEldersAuthElderlyService;
-
-
/**
* 高领老人列表
+ *
* @param pageEldersAuthElderlyDTO
* @return
*/
@PostMapping("/page")
- R query(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO){
-// ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
-// pageEldersAuthElderlyDTO.setUserId(getUserId());
+ R query(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO) {
+ // ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
+ // pageEldersAuthElderlyDTO.setUserId(getUserId());
return comEldersAuthElderlyService.pageQueryEldersAuthElderly(pageEldersAuthElderlyDTO);
}
/**
* 批量保存高龄老人
+ *
* @param eldersAuthElderlyExcelVOS
* @return
*/
@PostMapping("/batchSave")
- R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy){
- if(eldersAuthElderlyExcelVOS==null||eldersAuthElderlyExcelVOS.size()==0){
+ R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,
+ @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy) {
+ if (eldersAuthElderlyExcelVOS == null || eldersAuthElderlyExcelVOS.size() == 0) {
return R.fail("模板高龄老人数据为空");
}
- return comEldersAuthElderlyService.batchSave(eldersAuthElderlyExcelVOS,communityId,createBy);
+ return comEldersAuthElderlyService.batchSave(eldersAuthElderlyExcelVOS, communityId, createBy);
}
/**
* 查看高龄老人详情
+ *
* @param id
* @return
*/
@GetMapping("/{id}")
- R getById(@PathVariable("id") Long id){
+ R getById(@PathVariable("id") Long id) {
return comEldersAuthElderlyService.getEldersAuthElderlyById(id);
}
/**
* 修改高领老人信息
+ *
* @param eldersAuthElderlyDTO
* @return
*/
@PostMapping("/update")
- R update(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO){
+ R update(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO) {
return comEldersAuthElderlyService.updateEldersAuthElderly(eldersAuthElderlyDTO);
}
/**
* 删除高领老人
+ *
* @param id
* @return
*/
@PostMapping("/delete")
- R deleteEldersAuthElderly(@RequestParam("id") Long id){
+ R deleteEldersAuthElderly(@RequestParam("id") Long id) {
return comEldersAuthElderlyService.deleteEldersAuthElderly(id);
}
--
Gitblit v1.7.1