数据同步调整

YYC

2025-03-26 c75c27634f569b439c83d606b052257df3d82f0a

数据同步调整

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java

@@ -216,9 +216,7 @@
                if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }
                if (!sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getCheckTime(), 30));
                }

                apiData.setPzjlsj(sysData.getEmptyWeightTime());
                apiData.setPzjby(sysData.getEmptyWeightUser());
                apiData.setPzjly(sysData.getEmptyWeightUser());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java

@@ -146,7 +146,7 @@
                        sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                    }

                    apiData.setQysj(sysData.getRegisterTime());

                    apiData.setQyrxm(sysData.getCheckUser());
                    //扦样方式 2-智能随机
                    apiData.setQyfs("2");
@@ -186,7 +186,20 @@
                        apiData.setJyjg("1");
                    }
                    apiData.setJyrxm(sysData.getCheckUser());
                    apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
                    if (null == sysData.getCheckTime()) {
                        sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
                    }
                    if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
                        sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
                    }
                    apiData.setJysj(sysData.getCheckTime());
                    if (null == sysData.getSampleTime()) {
                        sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
                    }
                    if (sysData.getSampleTime().after(sysData.getCheckTime())) {
                        sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
                    }
                    apiData.setQysj(sysData.getSampleTime());

                    //粮食品种
                    String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java

@@ -108,7 +108,7 @@
                apiData.setCd(mappingCode);

                apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "保管员" : api1105.getBgy());

                apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
                apiData.setLqxzqhdm(api1102.getXzqhdm());
                if (apiData.getLsxzdm().equals("121")) {
                    //省级储备粮-粮权行政区划代码为省级
@@ -120,15 +120,18 @@
                }

                //粮权归属单位
                api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
                if(null != api1208List && api1208List.size() > 0){
                    apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
                    apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
                    apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
                if (null == apiData.getLqgsdwdm()) {
                    api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
                    if (null != api1208List && api1208List.size() > 0) {
                        apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
                        apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
                        apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
                    }
                }


                //若为商品粮，则粮权性质区划代码为null
                if("200".equals(apiData.getLsxzdm())){
                if ("200".equals(apiData.getLsxzdm())) {
                    apiData.setLqxzqhdm(null);
                }