From 92e9a4a4a5a48a575a5b9c996a02a23c3d815348 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 21 十月 2023 10:34:15 +0800
Subject: [PATCH] 优化上海接口字段

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java   |    7 +
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java   |   11 ++
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java   |   27 ++++--
 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java   |   68 ++++++++--------
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java   |    8 +
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |  100 ++++++++++++++++++++++--
 6 files changed, 158 insertions(+), 63 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 94ce819..3e204e2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -60,47 +60,47 @@
         Date start = param.getStart();
         Date end = param.getEnd();
 
-//        //瀹㈡埛鍚屾
-//        fzzySync1212.syncData(kqdm, deptId, start, end);
-//
-//        //鍚堝悓鍚屾
-//        fzzySync1201.syncData(kqdm, deptId, start, end);
-//
-//        //绮鍏ュ簱鍚屾
-//        fzzySync1202.syncData(kqdm, deptId, start, end);
-//
-//        //绮鍏ュ簱璐ㄦ
-//        fzzySync1203.syncData(kqdm, deptId, start, end);
-//
-//        //绮鍏ュ簱缁撶畻
-//        fzzySync1204.syncData(kqdm, deptId, start, end);
-//        //绮鍑哄簱鍚屾
-//        fzzySync1205.syncData(kqdm, deptId, start, end);
-//
-//        //绮鍑哄簱缁撶畻
-//        fzzySync1206.syncData(kqdm, deptId, start, end);
-//        //绮鎹熺泭
-//        fzzySync1209.syncData(kqdm, deptId, start, end);
-//        //鍊掍粨淇℃伅鍚屾
-//        fzzySync1207.syncData(kqdm, deptId, start, end);
-//
-//        //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+        //瀹㈡埛鍚屾
+        fzzySync1212.syncData(kqdm, deptId, start, end);
+
+        //鍚堝悓鍚屾
+        fzzySync1201.syncData(kqdm, deptId, start, end);
+
+        //绮鍏ュ簱鍚屾
+        fzzySync1202.syncData(kqdm, deptId, start, end);
+
+        //绮鍏ュ簱璐ㄦ
+        fzzySync1203.syncData(kqdm, deptId, start, end);
+
+        //绮鍏ュ簱缁撶畻
+        fzzySync1204.syncData(kqdm, deptId, start, end);
+        //绮鍑哄簱鍚屾
+        fzzySync1205.syncData(kqdm, deptId, start, end);
+
+        //绮鍑哄簱缁撶畻
+        fzzySync1206.syncData(kqdm, deptId, start, end);
+        //绮鎹熺泭
+        fzzySync1209.syncData(kqdm, deptId, start, end);
+        //鍊掍粨淇℃伅鍚屾
+        fzzySync1207.syncData(kqdm, deptId, start, end);
+
+        //鍑哄叆搴撴枃浠朵俊鎭悓姝�
         fzzySync1109.syncData(kqdm, deptId, start, end);
 
         //绮搴撳瓨鍚屾
-//        fzzySync1208.syncData(kqdm, deptId, start, end);
+        fzzySync1208.syncData(kqdm, deptId, start, end);
 
         //绮鎬ц川杞彉淇℃伅鍚屾
-//        fzzySync1210.syncData(kqdm, deptId, start, end);
+        fzzySync1210.syncData(kqdm, deptId, start, end);
 
         /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
-//        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
-//            //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ュ競鍌ㄦ鏂ゅ崟锛屽悓姝ュ競鍌ㄩ┏杩愬崟
-//            //鍚屾甯傚偍妫�鏂ゅ崟
-//            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//            //鍚屾甯傚偍椹宠繍鍗�
-//            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-//        }
+        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
+            //涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ュ競鍌ㄦ鏂ゅ崟锛屽悓姝ュ競鍌ㄩ┏杩愬崟
+            //鍚屾甯傚偍妫�鏂ゅ崟
+            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+            //鍚屾甯傚偍椹宠繍鍗�
+            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+        }
         //璐﹂潰搴撳瓨淇℃伅鍚屾  TODO
 
     }
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 2a5e59c..1335dd4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -118,7 +118,6 @@
                 apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
 
                 //鑾峰彇鍚堝悓鍙�
-                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                 listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
                 if(null != listInoutNotice && listInoutNotice.size() >0){
                     if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -150,8 +149,11 @@
                 apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
 
                 //浜у湴浠g爜
-                String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
-                apiData.setCddm(cddm);
+                mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
+                if(StringUtils.isEmpty(mappingCode)){
+                    mappingCode = apiData.getHwdm().substring(2,8);
+                }
+                apiData.setCddm(mappingCode);
 
                 //妫�鏂ょ被鍨嬶紝榛樿0-绉伴噸鍏ュ簱
                 apiData.setJjlx("0");
@@ -213,6 +215,9 @@
 
                     int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                     for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+                        if(fz40InoutRecordItem.getSettleWeight() <= 0){
+                            continue;
+                        }
                         apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                         apiData.setMz(fz40InoutRecordItem.getFullWeight());
                         apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index bcfea4f..1adbed9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -114,7 +114,6 @@
             apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
 
             //鑾峰彇鍚堝悓鍙�
-            apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
             listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
             if(null != listInoutNotice && listInoutNotice.size() >0){
                 if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -147,8 +146,11 @@
             apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
 
             //浜у湴浠g爜
-            String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
-            apiData.setCddm(cddm);
+            mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
+            if(StringUtils.isEmpty(mappingCode)){
+                mappingCode = apiData.getHwdm().substring(2,8);
+            }
+            apiData.setCddm(mappingCode);
 
             //鐨噸淇℃伅
             apiData.setPz(sysData.getEmptyWeight());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 43e2902..4b0f543 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -101,8 +101,11 @@
                 apiData.setShnd(fz40DepotStore.getFoodYear());
 
                 //浜у湴浠g爜
-                String cd = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
-                apiData.setCd(cd);
+                mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
+                if(StringUtils.isEmpty(mappingCode)){
+                    mappingCode = apiData.getHwdm().substring(2,8);
+                }
+                apiData.setCd(mappingCode);
 
                 apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
                 //绮潈褰掑睘鍗曚綅
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index dbeb58e..0264e4b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -8,12 +8,14 @@
 import com.fzzy.api.service.ApiCommonService;
 import com.fzzy.api.service.ApiTriggerService;
 import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.DateUtil;
 import com.fzzy.api.view.repository.Api1310Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
 import com.fzzy.api.view.repository.GbCheckItemRep;
 import com.fzzy.async.fzzy40.entity.Fz40CheckItem;
 import com.fzzy.async.fzzy40.entity.Fz40Quality;
 import com.fzzy.async.fzzy40.repository.Fzzy40Sync1203Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1208Rep;
 import com.fzzy.async.fzzy40.repository.Fzzy40Sync1310Rep;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -78,7 +80,7 @@
             List<Fz40CheckItem> fz40CheckItems;
             List<GbCheckItem> gbCheckList;
             String jyxm;
-            String jyxmz;
+            String jyz;
             List<Api1310> api1310List;
             int index = 10001;
             for (Fz40Quality fz40Quality : list) {
@@ -91,7 +93,7 @@
                 api1310.setHwdm(api1105.getHwdm());
                 api1310.setKqdm(kqdm);
                 //绮鍝佺
-                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0,3));
+                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
                 api1310.setLspzdm(mappingCode);
 
                 //绮绛夌骇
@@ -106,12 +108,12 @@
                 api1310.setZblb("2");
                 //妫�娴嬮」锛屾娴嬪��
                 jyxm = "";
-                jyxmz = "";
+                jyz = "";
                 fz40CheckItems = fzzySync1203Rep.listInoutCheckItem(fz40Quality.getId(), deptId.substring(0, 4));
                 if (null != fz40CheckItems && fz40CheckItems.size() > 0) {
 
                     for (Fz40CheckItem fz40CheckItem : fz40CheckItems) {
-                        if(StringUtils.isEmpty(fz40CheckItem.getValue())){
+                        if (StringUtils.isEmpty(fz40CheckItem.getValue())) {
                             continue;
                         }
                         gbCheckList = gbCheckItemRep.findByBizCode(fz40CheckItem.getStandardId());
@@ -119,16 +121,19 @@
                             continue;
                         }
                         jyxm += gbCheckList.get(0).getCode() + ",";
-                        jyxmz += fz40CheckItem.getValue() + ",";
+                        jyz += fz40CheckItem.getValue() + ",";
                     }
                 }
                 api1310.setJyxm(jyxm);
-                api1310.setJyxmz(jyxmz);
+                api1310.setJyxmz(jyz);
 
                 api1310.setZbjgpd(fz40Quality.getResult());
                 api1310.setQfrq(fz40Quality.getTime());
                 api1310.setBgcjsj(fz40Quality.getTime());
                 api1310.setShrxm(fz40Quality.getCheckUser());
+                if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
+                    fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
+                }
                 api1310.setQysj(fz40Quality.getCheckTime());
                 api1310.setQyqy(fz40Quality.getCheckArea());
                 api1310.setQyrxm(fz40Quality.getCheckUser());
@@ -136,20 +141,20 @@
 
                 api1310.setYpsl(fz40Quality.getYpsl() == null ? 0.0 : fz40Quality.getYpsl());
                 api1310.setDbsl(fz40Quality.getDbsl() == null ? 0.0 : fz40Quality.getDbsl());
-                api1310.setYpdj(StringUtils.isEmpty(fz40Quality.getYpdj())?"0": fz40Quality.getYpdj());
-                api1310.setSfzcccnx(StringUtils.isEmpty(fz40Quality.getNormalYear())?"0": fz40Quality.getNormalYear());
+                api1310.setYpdj(StringUtils.isEmpty(fz40Quality.getYpdj()) ? "0" : fz40Quality.getYpdj());
+                api1310.setSfzcccnx(StringUtils.isEmpty(fz40Quality.getNormalYear()) ? "0" : fz40Quality.getNormalYear());
                 api1310.setBz(fz40Quality.getRemark());
                 api1310.setZhgxsj(new Date());
 
                 api1310List = api1310Rep.getDataByZjbgdh(api1310.getZjbgdh());
-                if(null == api1310List || api1310List.isEmpty()){
+                if (null == api1310List || api1310List.isEmpty()) {
                     api1310.setCzbz(Constant.CZBZ_I);
-                }else {
+                } else {
                     api1310.setCzbz(api1310List.get(0).getCzbz());
                 }
 
                 api1310Rep.save(api1310);
-                index ++;
+                index++;
             }
         } catch (Exception e) {
             log.error("---鍚屾澶辫触----{}", e);
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 3a84775..b007083 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -19,6 +19,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.lang.reflect.Field;
 import java.util.*;
 
@@ -45,6 +46,8 @@
     private Api1102Rep api1102Rep;
     @Autowired
     private Api1104Rep api1104Rep;
+    @Autowired
+    private Api1208Rep api1208Rep;
     @Autowired
     private Api1109Rep api1109Rep;
     @Autowired
@@ -110,7 +113,7 @@
             //鑾峰彇鎸囦护id
             String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
             OrderData orderData = (OrderData) redisUtil.get(key);
-            if (StringUtils.isEmpty(orderData.getOrderid())) {
+            if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
                 log.error("鎸囦护id澶辨晥=" + jsonData);
                 ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
                 apiLog.setStatus(99);
@@ -154,6 +157,7 @@
 
     /**
      * 杞负JSON
+     *
      * @param inteId
      * @param data
      * @param code
@@ -177,6 +181,7 @@
 
     /**
      * 甯歌鎺ュ彛灏佽
+     *
      * @param inteId
      * @param data
      * @param code
@@ -264,7 +269,11 @@
             Map<String, String> map = new HashMap<>();
             map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
             api1109.setWjl(JSON.toJSONString(map));
-
+            //涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
+            String[] split = api1109.getWjmc().split(".");
+            if (split.length == 2) {
+                api1109.setWjmc(split[0] + "_00" + split[1]);
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1109);
             return api1109;
@@ -315,7 +324,14 @@
             BeanUtils.copyProperties(data, api1201);
             api1201.setBjw(ShAreaBjw.getBjw(code));
             api1201.setHtsfzz("0");
-
+            //鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧~鏃�
+            if (StringUtils.isEmpty(api1201.getQddd())) {
+                api1201.setQddd("绛捐鍦扮偣");
+            }
+            //鍚堝悓瀹℃牳浜轰笉鑳戒负绌烘垨濉棤
+            if (StringUtils.isEmpty(api1201.getShr())) {
+                api1201.setShr("瀹℃壒浜�");
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1201);
             return api1201;
@@ -327,7 +343,18 @@
             api1202.setBjw(ShAreaBjw.getBjw(code));
             api1202.setPch(apiData.getHwdm() + apiData.getShnd());
             api1202.setJzrq(apiData.getCmsj());
-
+            if (StringUtils.isEmpty(api1202.getCddm())) {
+                api1202.setCddm(api1202.getHwdm().substring(2, 8));
+            }
+            if (StringUtils.isEmpty(api1202.getHth())) {
+                api1202.setHth("鏃�");
+            }
+            if (StringUtils.isEmpty(api1202.getJhmxh())) {
+                api1202.setJhmxh("璁″垝鏄庣粏鍙�");
+            }
+            if (StringUtils.isEmpty(api1202.getRkjsdh())) {
+                api1202.setRkjsdh("0");
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1202);
             return api1202;
@@ -340,6 +367,18 @@
             //鏌ヨ鏀惰幏骞翠唤
             List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
             api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+            if (StringUtils.isEmpty(api1203.getJyxm())) {
+                api1203.setJyxm("0");
+            }
+            if (StringUtils.isEmpty(api1203.getJyz())) {
+                api1203.setJyz("0");
+            }
+            if (StringUtils.isEmpty(api1203.getZkj())) {
+                api1203.setZkj("0");
+            }
+            if (StringUtils.isEmpty(api1203.getZkl())) {
+                api1203.setZkl("0");
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1203);
             return api1203;
@@ -363,7 +402,18 @@
             api1205.setBjw(ShAreaBjw.getBjw(code));
             api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
             api1205.setJzrq(apiData.getCmsj());
-
+            if (StringUtils.isEmpty(api1205.getCddm())) {
+                api1205.setCddm(api1205.getHwdm().substring(2, 8));
+            }
+            if (StringUtils.isEmpty(api1205.getHth())) {
+                api1205.setHth("鏃�");
+            }
+            if (StringUtils.isEmpty(api1205.getJhmxh())) {
+                api1205.setJhmxh("璁″垝鏄庣粏鍙�");
+            }
+            if (StringUtils.isEmpty(api1205.getCkjsdh())) {
+                api1205.setCkjsdh("0");
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1205);
             return api1205;
@@ -403,7 +453,9 @@
 
             api1208.setBjw(ShAreaBjw.getBjw(code));
             api1208.setPch(apiData.getHwdm() + apiData.getShnd());
-
+            if (StringUtils.isEmpty(api1208.getCd())) {
+                api1208.setCd(api1208.getHwdm().substring(2, 8));
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1208);
             return api1208;
@@ -516,7 +568,9 @@
             //涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
             api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
             api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
-
+            if (StringUtils.isEmpty(api1305.getTfmd())) {
+                api1305.setTfmd("1"); //闄嶆俯閫氶
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1305);
             return api1305;
@@ -530,7 +584,9 @@
             api1306.setAjdm(apiData.getHwdm().substring(0, 28));
             //涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
             api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
-
+            if (StringUtils.isEmpty(api1306.getSyff())) {
+                api1306.setSyff("0"); //娼В娉�
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1306);
             return api1306;
@@ -576,8 +632,32 @@
             BeanUtils.copyProperties(apiData, api1310);
             api1310.setBjw(ShAreaBjw.getBjw(code));
             api1310.setJyrq(apiData.getJysj());
-            api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
-
+            if (StringUtils.isEmpty(api1310.getJyxm())) {
+                api1310.setJyxm("0");
+            }
+            if (StringUtils.isEmpty(api1310.getJyxmz())) {
+                api1310.setJyxmz("0");
+            }
+            String lsxzdm = "122";
+            List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
+            if(null != api1208List && api1208List.size() > 0){
+                if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
+                    lsxzdm = api1208List.get(0).getLsxzdm();
+                }
+            }
+            api1310.setLsxzdm(lsxzdm);
+            if (api1310.getYpsl() == 0.0){
+                api1310.setYpsl(5.0);
+            }
+            if(StringUtils.isEmpty(api1310.getQyrxm())){
+                api1310.setQyrxm("鎵︽牱浜�");
+            }
+            if(StringUtils.isEmpty(api1310.getJdrxm())){
+                api1310.setJdrxm("鐩戠潱浜�");
+            }
+            if(StringUtils.isEmpty(api1310.getShrxm())){
+                api1310.setShrxm("瀹℃牳浜�");
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1310);
             return api1310;

--
Gitblit v1.9.3