|
@@ -60,7 +60,7 @@ public class BmdataSyncServiceImpl implements IBmdataSyncService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void pushToU9(String pk_group, String pk_org, String pk_bm_class, String cyear, String cperiod, String push_type,String provision) throws BusinessException {
|
|
|
|
|
|
+ public void pushToU9(String pk_group, String pk_org, String pk_bm_class, String cyear, String cperiod, String push_type, String provision) throws BusinessException {
|
|
|
|
|
|
|
|
|
|
List<WaDataToU9BVO> reportDataByParam = getReportDataByParam(pk_org, pk_bm_class, cyear, cperiod);
|
|
List<WaDataToU9BVO> reportDataByParam = getReportDataByParam(pk_org, pk_bm_class, cyear, cperiod);
|
|
@@ -69,7 +69,7 @@ public class BmdataSyncServiceImpl implements IBmdataSyncService {
|
|
for (Map.Entry<String, List<WaDataToU9BVO>> entry : erporgcode.entrySet()) {
|
|
for (Map.Entry<String, List<WaDataToU9BVO>> entry : erporgcode.entrySet()) {
|
|
String erporgCode = entry.getKey();
|
|
String erporgCode = entry.getKey();
|
|
List<WaDataToU9BVO> erporgData = entry.getValue();
|
|
List<WaDataToU9BVO> erporgData = entry.getValue();
|
|
- String erporg = erporgData.get(0).getErporg();
|
|
|
|
|
|
+ String erporg = erporgData.get(0).getErporg();
|
|
if (checkPush(pk_org, pk_bm_class, cyear, cperiod, erporg)) {
|
|
if (checkPush(pk_org, pk_bm_class, cyear, cperiod, erporg)) {
|
|
WaDataToU9HVO waDataToU9HVO = new WaDataToU9HVO();
|
|
WaDataToU9HVO waDataToU9HVO = new WaDataToU9HVO();
|
|
waDataToU9HVO.setErporgcode(erporgCode);
|
|
waDataToU9HVO.setErporgcode(erporgCode);
|
|
@@ -81,8 +81,9 @@ public class BmdataSyncServiceImpl implements IBmdataSyncService {
|
|
waDataToU9HVO.setErporg(erporg);
|
|
waDataToU9HVO.setErporg(erporg);
|
|
waDataToU9HVO.setHr_type("bm");
|
|
waDataToU9HVO.setHr_type("bm");
|
|
waDataToU9HVO.setProvision(provision);
|
|
waDataToU9HVO.setProvision(provision);
|
|
- BmToU9LogHVO initLogVO = getInitLogVO(pk_org, pk_bm_class, cyear, cperiod, erporg,erporgCode);
|
|
|
|
|
|
+ BmToU9LogHVO initLogVO = getInitLogVO(pk_org, pk_bm_class, cyear, cperiod, erporg, erporgCode);
|
|
String paramStr = JSONObject.toJSONString(waDataToU9HVO);
|
|
String paramStr = JSONObject.toJSONString(waDataToU9HVO);
|
|
|
|
+ initLogVO.setParam(paramStr);
|
|
try {
|
|
try {
|
|
String res = U9Interface.syncWaToU9(paramStr);
|
|
String res = U9Interface.syncWaToU9(paramStr);
|
|
initLogVO.setContent(res);
|
|
initLogVO.setContent(res);
|
|
@@ -111,13 +112,13 @@ public class BmdataSyncServiceImpl implements IBmdataSyncService {
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
- throw new BusinessException("该险种统计数量为空");
|
|
|
|
|
|
+ throw new BusinessException("推送数量为空,请检查数据是否缺失且已审核");
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- BmToU9LogHVO getInitLogVO(String pk_org, String pk_bm_class, String cyear, String cperiod, String pk_erporg,String erporgCode) {
|
|
|
|
|
|
+ BmToU9LogHVO getInitLogVO(String pk_org, String pk_bm_class, String cyear, String cperiod, String pk_erporg, String erporgCode) {
|
|
BmToU9LogHVO bmToU9LogHVO = new BmToU9LogHVO();
|
|
BmToU9LogHVO bmToU9LogHVO = new BmToU9LogHVO();
|
|
bmToU9LogHVO.setCreation_time(new UFDateTime());
|
|
bmToU9LogHVO.setCreation_time(new UFDateTime());
|
|
bmToU9LogHVO.setPk_bm_class(pk_bm_class);
|
|
bmToU9LogHVO.setPk_bm_class(pk_bm_class);
|
|
@@ -169,8 +170,8 @@ public class BmdataSyncServiceImpl implements IBmdataSyncService {
|
|
if (docs != null && docs.size() > 0) {
|
|
if (docs != null && docs.size() > 0) {
|
|
docs.forEach(doc -> {
|
|
docs.forEach(doc -> {
|
|
for (Map.Entry<String, String> entry : entries) {
|
|
for (Map.Entry<String, String> entry : entries) {
|
|
- BigDecimal amount = new BigDecimal(ObjectUtils.toString(doc.get(entry.getKey()),"0"));
|
|
|
|
- if(BigDecimal.ZERO.compareTo(amount)==0) continue; // 20231010 dzz 杨梅说没钱的不推
|
|
|
|
|
|
+ BigDecimal amount = new BigDecimal(ObjectUtils.toString(doc.get(entry.getKey()), "0"));
|
|
|
|
+ if (BigDecimal.ZERO.compareTo(amount) == 0) continue; // 20231010 dzz 杨梅说没钱的不推
|
|
WaDataToU9BVO waDataToU9BVO = new WaDataToU9BVO();
|
|
WaDataToU9BVO waDataToU9BVO = new WaDataToU9BVO();
|
|
waDataToU9BVO.setErporgcode((String) doc.get("erporgcode"));
|
|
waDataToU9BVO.setErporgcode((String) doc.get("erporgcode"));
|
|
waDataToU9BVO.setErporg((String) doc.get("erporg"));
|
|
waDataToU9BVO.setErporg((String) doc.get("erporg"));
|