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/service/ComSwRotaService.java

@@ -1,18 +1,13 @@
package com.panzhihua.service_community.service;

import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.service_community.model.dos.ComSwRotaDO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.Date;
import java.util.List;

/**
 * @auther txb
@@ -23,53 +18,66 @@

    /**
     * 分页查询值班表
     * @param comSwRotaPageDTO 查询参数
     * 
     * @param comSwRotaPageDTO
     *            查询参数
     * @return 值班表分页集合
     */
    R pageRota(ComSwRotaPageDTO comSwRotaPageDTO);

    /**
     * 根据id查询值班表
     * @param rotaId 值班表id
     * 
     * @param rotaId
     *            值班表id
     * @return 值班表详情
     */
    R detailRota(Long rotaId);

    /**
     * 新增值班表
     * @param comSwRotaSaveDTOs 新增参数
     * 
     * @param comSwRotaSaveDTOs
     *            新增参数
     * @return 新增结果
     */
    R addRota(List<ComSwRotaSaveDTO> comSwRotaSaveDTOs);

    /**
     * 批量删除值班表
     * @param rotaIds 值班ids
     * 
     * @param rotaIds
     *            值班ids
     * @return 删除结果
     */
    R deleteRota(List<Long> rotaIds);

    /**
     * 查询当天值班人员
     * 
     * @return 查询结果
     */
    R getRotaPersonByDate(String rotaDate);

    /**
     * 查询当天值班领导
     * 
     * @return 查询结果
     */
    R getRotaLeaderByDate(String rotaDate);

    /**
     * 选择人员
     * 
     * @return 查询结果
     */
    R getTotlePerson(String param,Long communityId);
    R getTotlePerson(String param, Long communityId);

    /**
     * 批量导入值班表
     *
     * @param list 值班表集合
     * @param list
     *            值班表集合
     */
    R listSaveSwRotaExcelVO(List<ComSwRotaExcelVO> list, Long communityId);