Merge remote-tracking branch 'origin/master'

YYC

2026-02-27 1369c87ddcc0e76e17d01208ef66261ee0cd27da

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java

@@ -4,6 +4,7 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.mapper.PledgeContractMapper;
import com.fzzy.igds.utils.ContextUtil;
@@ -50,6 +51,18 @@
        queryWrapper.orderByDesc("update_time");

        return pledgeContractMapper.selectList(queryWrapper);
    }

    /**
     * 根据条件查询
     * @param id
     * @return
     */
    public PledgeContract getOne(String id) {

        QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", id);
        return pledgeContractMapper.selectOne(queryWrapper);
    }


@@ -104,8 +117,8 @@
        queryWrapper.like("status", Constant.YN_N);

        //质押期间
        queryWrapper.ge("pledge_start", curTime);
        queryWrapper.le("pledge_end", curTime);
        queryWrapper.le("pledge_start", curTime);
        queryWrapper.ge("pledge_end", curTime);

        queryWrapper.orderByDesc("update_time");