From 18967104565d14fc04d848aa8cb54653b84b19ce Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 29 六月 2024 17:42:21 +0800
Subject: [PATCH] 广东省平台v5.1-增加封仓确认单和出清确认单
---
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
index bdb0556..b951e52 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
@@ -9,7 +9,6 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
@@ -17,13 +16,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -38,7 +34,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* 涓婃捣甯傛帴鍙�-2101 妫�鏂ゅ崟
@@ -118,15 +113,22 @@
if (null == data.getPch() || data.getPch() == "") {
data.setPch(data.getHwdm() + DateFormatUtils.format(data.getJjrq(), "yyyy"));
}
- ApiInfoData infoData = new ApiInfoData();
- infoData.setId(data.getJjdh());
- infoData.setKqdm(data.getKqdm());
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getJjdh());
- infoData.setData(JSON.toJSONString(data));
- infoData.setCzbz(data.getCzbz());
- infoData.setRemarks("澶囨敞淇℃伅");
+ ApiInfoData infoData;
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
+ if (apiInfoList.size() != 0) {
+ infoData = apiInfoList.get(0);
+ infoData.setData(JSON.toJSONString(data));
+ } else {
+ infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getJjdh());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+ }
apiInfoDataRep.save(infoData);
}
@@ -136,19 +138,21 @@
*/
@Expose
public void delData(SH2023Api2101 data) {
- apiInfoDataRep.deleteById(data.getJjdh());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
+ apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
/**
* sHApi2101PR#delUpdate
*/
@Expose
- public String delUpdate(SH2023Api2101 entity) {
- if (null == entity) {
+ public String delUpdate(SH2023Api2101 data) {
+ if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- entity.setCzbz(Constant.CZBZ_D);
- apiInfoDataRep.updateStatus(entity.getJjdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
+ data.setCzbz(Constant.CZBZ_D);
+ apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
}
@@ -160,7 +164,9 @@
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
- if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
//灏佽鍙傛暟
ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2101);
@@ -175,23 +181,16 @@
responseDto = apiService.pushData(param, apiConf, items);
if (responseDto.getSuccess() == 0) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-
ApiInfoData infoData;
for (SH2023Api2101 data : items) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- infoData = new ApiInfoData();
- infoData.setId(data.getBizId());
- infoData.setKqdm(data.getKqdm());
- infoData.setInteType("21");
- infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(data.getBizId());
-
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
+ infoData = apiInfoList.get(0);
+ infoData.setUpdateTime(new Date());
infoData.setCzbz(Constant.CZBZ_U);
infoData.setData(JSON.toJSONString(data));
-
apiInfoDataRep.save(infoData);
}
}
--
Gitblit v1.9.3