From 9529f6d7c63b2483b9bf73888d1ead2388e0a292 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期二, 25 二月 2025 11:55:27 +0800 Subject: [PATCH] 性质转变同步代码修改 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 16 ++++++++-------- src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java index 62bd063..b4a7093 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java @@ -85,11 +85,11 @@ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType()); apiData.setHzhlsxzdm(mappingCode); apiData.setHzrq(sysData.getChangeTime()); - apiData.setCcshr(sysData.getCcshr()); - apiData.setZjshr(sysData.getZjshr()); - apiData.setTjshr(sysData.getTjshr()); - apiData.setKjshr(sysData.getKjshr()); - apiData.setLdshr(sysData.getLdshr()); + apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃壒浜�" : sysData.getCcshr()); + apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃壒浜�" : sysData.getZjshr()); + apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃壒浜�" : sysData.getTjshr()); + apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃壒浜�" : sysData.getKjshr()); + apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃壒浜�" : sysData.getLdshr()); apiData.setBz(sysData.getRemark()); apiData.setZhgxsj(new Date()); @@ -98,10 +98,10 @@ apiData.setKqdm(kqdm); apiData.setSyncTime(new Date()); api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh()); - if(null == api1210List || api1210List.isEmpty()){ + if (null == api1210List || api1210List.isEmpty()) { apiData.setCzbz(Constant.CZBZ_I); - }else { - if(StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())){ + } else { + if (StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())) { apiData.setJhmxdh(api1210List.get(0).getJhmxdh()); } apiData.setCzbz(api1210List.get(0).getCzbz()); diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java index e295188..c70990c 100644 --- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java +++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java @@ -13,6 +13,6 @@ * @Author:YAN */ public interface Fzzy40Sync1210Rep extends JpaRepository<Fz40InoutVarietyChange, String> { - @Query("from Fz40InoutVarietyChange where deptId=:deptId and changeTime >=:start and changeTime <:end order by changeTime ") + @Query("from Fz40InoutVarietyChange where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ") List<Fz40InoutVarietyChange> listVarietyChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end); } -- Gitblit v1.9.3