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

@@ -86,7 +86,12 @@
     * @param pageWrap 分页对象
     * @return PageData<ApplyDetail>
     */
    PageData<ApplyDetail> findPage(PageWrap<ApplyDetailPageDTO> pageWrap);
    PageData<ApplyDetail> findPage(PageWrap<ApplyDetail> pageWrap);

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

    List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO);


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

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