Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 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,10 +26,9 @@
    @Resource
    private ComEldersAuthElderlyService comEldersAuthElderlyService;



    /**
     * 高领老人列表
     * 
     * @param pageEldersAuthElderlyDTO
     * @return
     */
@@ -40,11 +41,13 @@

    /**
     * 批量保存高龄老人
     * 
     * @param eldersAuthElderlyExcelVOS
     * @return
     */
    @PostMapping("/batchSave")
    R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy){
    R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,
        @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy) {
        if(eldersAuthElderlyExcelVOS==null||eldersAuthElderlyExcelVOS.size()==0){
            return R.fail("模板高龄老人数据为空");
        }
@@ -53,6 +56,7 @@

    /**
     * 查看高龄老人详情
     * 
     * @param id
     * @return
     */
@@ -63,6 +67,7 @@

    /**
     * 修改高领老人信息
     * 
     * @param eldersAuthElderlyDTO
     * @return
     */
@@ -73,6 +78,7 @@

    /**
     * 删除高领老人
     * 
     * @param id
     * @return
     */