From 30e29906664f9f92886311804c7838f33b9b4cb2 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 31 十月 2024 18:34:45 +0800 Subject: [PATCH] 广东省新接口上报 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java index 58f2391..ff4b9d5 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java @@ -48,6 +48,8 @@ @Autowired private Api1204Rep api1204Rep; @Autowired + private Api1208Rep api1208Rep; + @Autowired private Api1404Rep api1404Rep; @Autowired private ApiCommonService commonService; @@ -144,6 +146,10 @@ } } + //绮潈鍗曚綅褰掑睘浠g爜 + List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm()); + apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getHwdm().substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm()); + apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress()); //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅 @@ -207,17 +213,17 @@ apiData.setBzbjs(sysData.getBzbjs()); apiData.setCmsj(sysData.getCompleteTime()); //缁撶畻鍗曞彿 - if(StringUtils.isNotEmpty(sysData.getSettleId())){ + if (StringUtils.isNotEmpty(sysData.getSettleId())) { apiData.setRkjsdh(kqdm + sysData.getSettleId()); } - if(StringUtils.isNotEmpty(apiData.getHth())){ + if (StringUtils.isNotEmpty(apiData.getHth())) { api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm()); - if(null == api1204List || api1204List.isEmpty()){ + if (null == api1204List || api1204List.isEmpty()) { api1204List = api1204Rep.getDataByHth(apiData.getHth()); - if(null != api1204List && api1204List.size() > 0){ + if (null != api1204List && api1204List.size() > 0) { apiData.setRkjsdh(api1204List.get(0).getRkjsdh()); } - }else { + } else { apiData.setRkjsdh(api1204List.get(0).getRkjsdh()); } } @@ -242,8 +248,8 @@ apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks()); apiData.setKlyy("鎵i噺鍘熷洜"); - apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser()); - apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser()); + apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser()); + apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser()); //01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱 //04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤 apiData.setCchlx("01"); -- Gitblit v1.9.3