Merge remote-tracking branch 'origin/master'

CZT

2023-09-27 2eb1ee7ee94cb0769009e1ce6a15dbd7eea792c9

 src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java

@@ -378,6 +378,27 @@
     */
    public void pushData1211(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO
        //粮食性质转变单
        List<Api1211> list = api1211Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----上海市平台2023版：未获取到粮食库存信息，不推送-----");
            return;
        }
        param.setInteId(SH2023Constant.SH_2023_API_CODE_1210);
        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, list);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            for (Api1211 data : list) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1211Rep.save(data);
                }
            }
        }

    }

@@ -462,7 +483,7 @@
        for (ApiInfoData infoData : items) {
            shApi2104 = JSONObject.parseObject(infoData.getData(), SH2023Api2104.class);
            shApi2104.setCzbz(infoData.getCzbz());
            shApi2104.setZhgxsh(infoData.getUpdateTime());
            shApi2104.setZhgxsj(infoData.getUpdateTime());
            list.add(shApi2104);
        }
        ResponseDto responseDto = apiRemoteService.pushData(param, list);