From 6fc5e2138599d7ef44bfc4b261f80e65cd6a43f6 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期二, 30 五月 2023 09:20:23 +0800
Subject: [PATCH] 上海嘉定纪委接口优化4
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 3 +++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 3 +++
src/main/java/com/fzzy/api/view/repository/Api1105Rep.java | 9 +++++++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 3 +++
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 26 +++++++++++++++++++++-----
5 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java
index d0fa9a1..cab6b0e 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java
@@ -6,6 +6,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
public interface Api1105Rep extends JpaRepository<Api1105, String> {
@@ -21,4 +22,12 @@
@Query("update Api1105 set czbz=:czbz where hwdm =:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ /**
+ * 鏍规嵁璐т綅浠ｇ爜鏌ヨ
+ * @param hwdm
+ * @return
+ */
+ @Query("from Api1105 where hwdm=:hwdm ")
+ List<Api1105> findPushDataByHwdm(@Param("hwdm") String hwdm);
+
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index c5582d0..3dfae3c 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -82,6 +82,9 @@
List<Api1202> api1202List;
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index ed9b4f6..b182d52 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -87,6 +87,9 @@
String zkl;
List<Api1203> api1203List;
for (Fz35InoutRecord sysData : list) {
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index aac0e91..d001fda 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -81,6 +81,9 @@
// List<GbArea> gbAreaList;
Calendar c = Calendar.getInstance();
for (Fz35InoutRecord sysData : list) {
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 028f4b8..bba2223 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -22,6 +22,7 @@
import org.springframework.stereotype.Service;
import java.text.DateFormat;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -49,6 +50,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1103Rep api1103Rep;
+ @Autowired
+ private Api1105Rep api1105Rep;
@Autowired
private Api1202Rep api1202Rep;
@Autowired
@@ -285,13 +288,12 @@
}
// 宸叉墽琛屾暟閲�
List<Api1202> api1202List = api1202Rep.getDataByTime(api1403.getKszxrq(), api1403.getJzzxrq());
-// DateUtils.format("yyyy-MM-dd HH:mm:ss", api1403.getKszxrq()),
-// DateUtils.format("yyyy-MM-dd HH:mm:ss", api1403.getJzzxrq()));
+
Double yzxsl = api1202List.stream()
.mapToDouble(Api1202::getJz)
.summaryStatistics().getSum();
- shjdjw1502.setJhsl(sum.toString());
- shjdjw1502.setYzxsl(yzxsl.toString());
+ shjdjw1502.setJhsl(new DecimalFormat("0.00").format(sum));
+ shjdjw1502.setYzxsl(new DecimalFormat("0.00").format(yzxsl));
//鎵ц姣斾緥
shjdjw1502.setZxbl(String.valueOf((yzxsl / sum * 100)));
@@ -309,6 +311,10 @@
shjdjwApi1203.setQydbh(api1203.getRkjydh());
shjdjwApi1203.setHwbm(api1203.getHwdm());
+ List<Api1105> list = api1105Rep.findPushDataByHwdm(api1203.getHwdm());
+ if(null != list && list.size() > 0){
+ shjdjwApi1203.setHwbm(list.get(0).getHwmc());
+ }
shjdjwApi1203.setYpbm(api1203.getRkywdh());
shjdjwApi1203.setJyjg(api1203.getJyz());
shjdjwApi1203.setJyjl(api1203.getJyjg());
@@ -375,7 +381,7 @@
BeanUtils.copyProperties(api1209, shjdjwApi1209);
shjdjwApi1209.setSydbh(api1209.getSydh());
- shjdjwApi1209.setHwbm(api1209.getHwdm());
+
shjdjwApi1209.setRksl(api1209.getRkjz());
shjdjwApi1209.setCksl(api1209.getCkjz());
shjdjwApi1209.setSysl(api1209.getJzsysl());
@@ -388,6 +394,12 @@
List<Api1102> listApi1102 = api1102Rep.findPushData(api1209.getKqdm());
if (null != listApi1102 && listApi1102.size() > 0) {
shjdjwApi1209.setKdmc(listApi1102.get(0).getKqmc());
+ }
+ //璐т綅淇℃伅
+ shjdjwApi1209.setHwbm(api1209.getHwdm());
+ List<Api1105> list = api1105Rep.findPushDataByHwdm(api1209.getHwdm());
+ if(null != list && list.size() > 0){
+ shjdjwApi1209.setHwbm(list.get(0).getHwmc());
}
shjdjwApi1209.setNx(api1209.getYwrq());
@@ -516,6 +528,10 @@
String ywdh = api1202.getRkywdh();
shjdjwApi1202.setYwdh(ywdh);
shjdjwApi1202.setHwbm(api1202.getHwdm());
+ List<Api1105> list = api1105Rep.findPushDataByHwdm(api1202.getHwdm());
+ if(null != list && list.size() > 0){
+ shjdjwApi1202.setHwbm(list.get(0).getHwmc());
+ }
shjdjwApi1202.setPzbm(api1202.getLspzdm());
shjdjwApi1202.setLqxzbm(api1202.getLsxzdm());
shjdjwApi1202.setZjkl(api1202.getZjklxj());
--
Gitblit v1.9.3