From 72e7feddac4d5ff64ce28f08e95643f10f00af3d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 04 三月 2024 21:40:50 +0800
Subject: [PATCH] 入库信息默认值

---
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index b6f0cc6..7454a6e 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -447,7 +447,9 @@
             //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
             List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
             if (null != api1404List && api1404List.size() > 0) {
-                api1202.setShnd(api1404List.get(0).getShnd());
+                if(StringUtils.isEmpty(api1202.getShnd())){
+                    api1202.setShnd(api1404List.get(0).getShnd());
+                }
                 List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
                 if(null != api1403List && api1403List.size() > 0){
                     if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
@@ -551,6 +553,9 @@
             //璁剧疆绮杞崲骞村害
             List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
             if (null != api1404List && api1404List.size() > 0) {
+                if(StringUtils.isEmpty(api1205.getShnd())){
+                    api1205.setShnd(api1404List.get(0).getShnd());
+                }
                 List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
                 if(null != api1403List && api1403List.size() > 0){
                     if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
@@ -787,10 +792,14 @@
             Api1306 apiData = (Api1306) data;
             BeanUtils.copyProperties(apiData, api1306);
             api1306.setBjw(ShAreaBjw.getBjw(code));
-            api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
             api1306.setAjdm(apiData.getHwdm().substring(0, 28));
             //涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
             api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
+            //璁剧疆鎵规鍙�
+            List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+            if (null != api1208List && api1208List.size() > 0) {
+                api1306.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+            }
             if (StringUtils.isEmpty(api1306.getSyff())) {
                 api1306.setSyff("0"); //娼В娉�
             }
@@ -843,7 +852,7 @@
             }
             String lsxzdm = "122";
             String pch = "";
-            List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
+            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1310.getHwdm());
             if (null != api1208List && api1208List.size() > 0) {
                 if (StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())) {
                     lsxzdm = api1208List.get(0).getLsxzdm();

--
Gitblit v1.9.3