CZT
2023-11-17 7acebbb64838e26f38f45b9ce51b568841eb5a18
优化数据
已修改9个文件
31 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -244,6 +244,9 @@
                        } else {
                            apiData.setCzbz(api1202List.get(0).getCzbz());
                        }
                        if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                            apiData.setCzbz(Constant.CZBZ_D);
                        }
                        api1202Rep.save(apiData);
                        idNum++;
                    }
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -101,6 +101,9 @@
                        int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                        for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                            if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                                continue;
                            }
                            listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                            idNum ++;
                        }
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -210,6 +210,9 @@
                int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                    if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                        continue;
                    }
                    if(fz40InoutRecordItem.getSettleWeight() <= 0){
                        continue;
                    }
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -120,7 +120,7 @@
                    api1302.setLssdzjh(getHumPointList2(fz40Grain.getPoints(), fz40Grain.getCable(), fz40Grain.getCableCir()));
                }
                api1302.setZhgxsj(fz40Grain.getReceiveDate());
                api1302.setZhgxsj(new Date());
                api1302.setBizId(fz40Grain.getBatchId());
                api1302.setKqdm(api1105.getKqdm());
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
@@ -105,11 +105,11 @@
                    api1303.setCldjpd("533");
                }
                api1303.setZhgxsj(syncTime);
                api1303.setZhgxsj(new Date());
                api1303.setBizId(fz40Pest.getBatchId());
                api1303.setKqdm(api1105.getKqdm());
                api1303.setSyncTime(syncTime);
                api1303.setSyncTime(new Date());
                api1303List = api1303Rep.getDataByHcjcdh(api1303.getHcjcdh());
                if (null == api1303List || api1303List.isEmpty()) {
                    api1303.setCzbz(Constant.CZBZ_I);
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
@@ -79,11 +79,11 @@
                api1304 = updateGasInfo(api1304, fz40Gas.getPoints());
                api1304.setZhgxsj(syncTime);
                api1304.setZhgxsj(new Date());
                api1304.setBizId(fz40Gas.getBatchId());
                api1304.setKqdm(api1105.getKqdm());
                api1304.setSyncTime(syncTime);
                api1304.setSyncTime(new Date());
                api1304List = api1304Rep.getDataByQtndjcdh(api1304.getQtndjcdh());
                if (null == api1304List || api1304List.isEmpty()) {
                    api1304.setCzbz(Constant.CZBZ_I);
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
@@ -92,7 +92,7 @@
                api1305.setTfzyfzr(fzAreationData.getChargeUser());
                api1305.setTfzyry(fzAreationData.getOperators());
                api1305.setTfsc(fzAreationData.getLongTime());
                api1305.setZhgxsj(fzAreationData.getUpdateTime());
                api1305.setZhgxsj(new Date());
                api1305.setKqdm(kqdm);
                api1305.setBizId(fzAreationData.getId());
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -90,7 +90,7 @@
                api1306.setSqff(fz40DrugLog.getVentilateMethod());
                api1306.setSqjsslhqnd(fz40DrugLog.getAfterPh3());
                api1306.setXzxgpj(fz40DrugLog.getEvaluate());
                api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
                api1306.setZhgxsj(new Date());
                api1306.setHwdm(api1105.getHwdm());
                api1306.setKqdm(kqdm);
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -428,8 +428,6 @@
            //轮换计划明细,不单独上传,在轮换计划中统一上传
            return null;
        }
//        changeObject(data);
        return JSON.toJSONString(data);
    }
@@ -443,7 +441,7 @@
        gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
        gdFinanceDto.setBbm("03");
        gdFinanceDto.setCzbz(api1503.getCzbz());
        gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
        gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        paddingData(gdFinanceDto, list, 1, "项目//t", "本期金额//t", "本年累计//t");
        paddingData(gdFinanceDto, list, 2, "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -495,7 +493,7 @@
        gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
        gdFinanceDto.setBbm("02");
        gdFinanceDto.setCzbz(api1502.getCzbz());
        gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
        gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        paddingData(gdFinanceDto, list, 1, "项目//t", "本月数//t", "本年累计数//t");
        paddingData(gdFinanceDto, list, 2, "一、经营活动产生的现金流量:", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -548,7 +546,7 @@
        gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
        gdFinanceDto.setBbm("01");
        gdFinanceDto.setCzbz(api1501.getCzbz());
        gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
        gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        paddingData(gdFinanceDto, list, 1, "资产//t", "期末余额//t", "年初余额//t");
        paddingData(gdFinanceDto, list, 2, "流动资产:", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");