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

k94314517

2024-10-29 6d784d07cb846fff146c05be086137d923702c67

 server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java

@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

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

@@ -92,7 +93,25 @@
        wrapper.orderByDesc("CREATE_DATE");
        return memberInsuranceMapper.selectList(wrapper);
    }
  


    @Override
    public List<MemberInsurance> getList(MemberInsurance memberInsurance) {
        memberInsurance.setIsdeleted(Constants.ZERO);
        QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
        if(!Objects.isNull(memberInsurance.getStatus())){
            if(memberInsurance.getStatus().equals(Constants.ZERO)){
                wrapper.lambda().ge(MemberInsurance::getStartTime,new Date());
            }else{
                wrapper.lambda().le(MemberInsurance::getStartTime,new Date());
            }
        }
        wrapper.lambda().orderByDesc(MemberInsurance::getCreateDate);
        return memberInsuranceMapper.selectList(wrapper);
    }



    @Override
    public PageData<MemberInsurance> findPage(PageWrap<MemberInsurance> pageWrap) {
        IPage<MemberInsurance> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -182,7 +201,9 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
        PageData<MemberInsurance> pageData = PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));

        return pageData;
    }


@@ -192,4 +213,8 @@
        QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
        return memberInsuranceMapper.selectCount(wrapper);
    }




}