From d772a530c931502bdcf9c0fda5a81698ddc07d70 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 30 十月 2023 20:59:13 +0800
Subject: [PATCH] 优化上海接口-轮换计划上报
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 577046a..90f4825 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -43,6 +43,8 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
private Api1102Rep api1102Rep;
@Autowired
private Api1104Rep api1104Rep;
@@ -338,7 +340,6 @@
Api1202 apiData = (Api1202) data;
BeanUtils.copyProperties(apiData, api1202);
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));
@@ -352,6 +353,9 @@
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
}
+
+ //璁剧疆鎵规鍙�
+ api1202.setPch(apiData.getHwdm() + apiData.getShnd());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -361,9 +365,6 @@
Api1203 apiData = (Api1203) data;
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
- //鏌ヨ鏀惰幏骞翠唤
- List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
if (StringUtils.isEmpty(api1203.getJyxm())) {
api1203.setJyxm("0");
}
@@ -376,6 +377,10 @@
if (StringUtils.isEmpty(api1203.getZkl())) {
api1203.setZkl("0");
}
+ //璁剧疆鎵规鍙�
+ List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -385,6 +390,8 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
+
+ //璁剧疆鎵规鍙�
api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -397,7 +404,7 @@
Api1205 apiData = (Api1205) data;
BeanUtils.copyProperties(apiData, api1205);
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));
@@ -411,6 +418,9 @@
if (StringUtils.isEmpty(api1205.getCkjsdh())) {
api1205.setCkjsdh("0");
}
+ //璁剧疆鎵规鍙�
+ api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -421,6 +431,7 @@
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
+ //璁剧疆鎵规鍙�
api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -449,6 +460,7 @@
api1208.setZglkdm(api1208.getHwdm().substring(0, 21));
api1208.setBjw(ShAreaBjw.getBjw(code));
+ //璁剧疆鎵规鍙�
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
if (StringUtils.isEmpty(api1208.getCd())) {
api1208.setCd(api1208.getHwdm().substring(2, 8));
@@ -629,6 +641,7 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
+
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -636,12 +649,16 @@
api1310.setJyxmz("0");
}
String lsxzdm = "122";
+ String pch = apiData.getHwdm() + DateFormatUtils.format(new Date(), "yyyy");
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();
+ pch = apiData.getHwdm() + api1208List.get(0).getShnd();
}
}
+ //璁剧疆鎵规鍙�
+ api1310.setPch(pch);
api1310.setLsxzdm(lsxzdm);
if (api1310.getYpsl() == 0.0){
api1310.setYpsl(5.0);
@@ -655,6 +672,7 @@
if(StringUtils.isEmpty(api1310.getShrxm())){
api1310.setShrxm("瀹℃牳浜�");
}
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
return api1310;
@@ -690,8 +708,10 @@
SH2023Api1403 api1403 = new SH2023Api1403();
Api1403 apiData = (Api1403) data;
BeanUtils.copyProperties(apiData, api1403);
- api1403.setJhzxdw(apiData.getJhxddw());
- api1403.setJhzxdwmc(apiData.getJhxddwmc());
+ List<Api1101> api1101List = api1101Rep.findDataByDwdm(apiData.getLhjhdh().substring(0, 18));
+
+ api1403.setJhzxdw(api1101List.get(0).getDwdm());
+ api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
//璁剧疆绌哄睘鎬т负榛樿鍊�
--
Gitblit v1.9.3