Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java

@@ -5,6 +5,7 @@
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.*;

@@ -44,7 +45,9 @@
     */
    @PostMapping("/batchSave")
    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);
    }

@@ -73,6 +76,7 @@
     * @param id
     * @return
     */
    @PostMapping("/delete")
    R deleteEldersAuthElderly(@RequestParam("id") Long id){
        return comEldersAuthElderlyService.deleteEldersAuthElderly(id);
    }