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

k94314517

2024-04-12 bba77182f3f07fc6faa9a6ab1df7efb2b649b995

 server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java

@@ -2,6 +2,7 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.ApplyDetailPageDTO;
import com.doumee.dao.business.model.ApplyDetail;
import java.util.List;

@@ -87,6 +88,11 @@
     */
    PageData<ApplyDetail> findPage(PageWrap<ApplyDetail> pageWrap);

    PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap);

    List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO);


    /**
     * 条件统计
     *
@@ -94,4 +100,11 @@
     * @return long
     */
    long count(ApplyDetail applyDetail);

    /**
     * 查询员工投保记录
     * @param memberId
     * @return
     */
    List<ApplyDetail> getMemberApplyList(Integer memberId);
}