Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-06-06 70cd3733e8d72a6bbcfcbfa78f8eecbdec7ee8f9

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java

@@ -9,7 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;

@@ -27,21 +26,6 @@
    private SeLossMapper seLossMapper;

    public QueryResultVo<List<VoLoss>> getLosses(QueryVo queryVo) {
        //完善查询挂失记录的起止时间
        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");

        //LocalDateTime lossTimeStart = queryVo.lossTimeStart;
        //LocalDateTime lossTimeStop = queryVo.lossTimeStop;
        //if(lossTimeStart != null) {
        //    lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        //    queryVo.setLossTimeStart(lossTimeStart);
        //}
        //
        //if(lossTimeStop != null) {
        //    lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        //    queryVo.setLossTimeStop(lossTimeStop);
        //}

        String lossTimeStart = queryVo.lossTimeStart;
        String lossTimeStop = queryVo.lossTimeStop;
        if(lossTimeStart != null) {
@@ -59,18 +43,8 @@
        Long itemTotal = seLossMapper.getRecordCount(params);

        QueryResultVo<List<VoLoss>> rsVo = new QueryResultVo<>() ;
        Integer pageCurr = 0;
        Integer pageSize = 10000;
        rsVo.pageCurr = 1;
        rsVo.pageSize = 10000;
        if(queryVo.pageSize != null && queryVo.pageCurr != null) {
            rsVo.pageSize = queryVo.pageSize ;
            rsVo.pageCurr = queryVo.pageCurr;
            pageSize = queryVo.pageSize ;
            pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
        }
        params.put("pageCurr", pageCurr);
        params.put("pageSize", pageSize);
        rsVo.pageSize = queryVo.pageSize ;
        rsVo.pageCurr = queryVo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = seLossMapper.getLosses(params);