Merge remote-tracking branch 'origin/master'

czt

2025-09-25 cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c

 src/main/java/com/fzzy/api/view/pr/Api1204PR.java

@@ -86,12 +86,12 @@
                    predicates.add(predicate2);
                }
                if (null != param.getStart()) {
                    Predicate predicate3 = cb.greaterThan(root.get("ywrq"), ContextUtil.getCurZero(param.getStart()));
                    Predicate predicate3 = cb.greaterThan(root.get("jssj"), ContextUtil.getCurZero(param.getStart()));
                    predicates.add(predicate3);
                }

                if (null != param.getEnd()) {
                    Predicate predicate4 = cb.lessThan(root.get("ywrq"), ContextUtil.getNextZero(param.getEnd()));
                    Predicate predicate4 = cb.lessThan(root.get("jssj"), ContextUtil.getNextZero(param.getEnd()));
                    predicates.add(predicate4);
                }
                return cb.and(predicates.toArray(new Predicate[0]));
@@ -164,9 +164,6 @@
     */
    @Expose
    public String pushData(List<Api1204> items) {
        ResponseDto responseDto;
        String result = "";
        Api1204 d;
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);

@@ -176,9 +173,6 @@
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
        if (null == apiService) return "系统没有当前推送协议配置，执行失败";

        if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
            return pushDataList(items, apiService, apiConf);
        }
        return pushDataSingle(items, apiService, apiConf);
    }
    /**