Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-05-31 b8e7bb1791ff41be5ee8150cc46af082d7444a65

 service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerReserveGoodsCmd.java

@@ -6,9 +6,7 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.intf.report.IReportOrderStatisticsInnerServiceSMO;
import com.java110.report.statistics.IOrderStatistics;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -61,8 +59,21 @@
            infos = new ArrayList<>();
        }

        freshStartDateAndEndDate(infos,ownerDto);

        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, infos);
        context.setResponseEntity(responseEntity);

    }

    private void freshStartDateAndEndDate(List<Map> infos,OwnerDto ownerDto) {
        if(infos == null || infos.size() < 1){
            return ;
        }

        for(Map info :infos){
            info.put("startDate",ownerDto.getStartDate());
            info.put("endDate",ownerDto.getEndDate());
        }
    }
}