diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml
index ba8c1c4d..ad5f4e4b 100644
--- a/buildpackage/pom.xml
+++ b/buildpackage/pom.xml
@@ -111,6 +111,12 @@
dongj
+
+ llg
+
+ llg
+
+
kangarooDataCenterV3
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 411215ea..beb4c48e 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -992,6 +992,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
mdmModuleSendLogEntity.setTableName(mainDb+"_send_log");
mdmModuleSendLogEntity.setFormmainId(doObjects.get(i).getString("id"));
mdmModuleSendLogEntity.setSts("Y");
+ mdmModuleSendLogEntity.setDataType("1");
mdmModuleSendLogEntity.setAppId(sysApplicationEntity.getId());
mdmModuleSendLogEntity.setApiId(apiEntity.getId());
//mdmModuleSendLogEntity.setDistributeId(mdmModuleDistributeEntities.get(i1).getId());
@@ -1122,10 +1123,12 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
}
//保存日志
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"1","发送成功",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
+ objects.get(i).put("sendsanfzt123",true);
continue;
}else {
//保存日志
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
+ objects.get(i).put("sendsanfzt123",false);
continue;
}
}
@@ -1133,12 +1136,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
//所有下发发送完成,修改数据状态
for (int i = 0; i < objects.size(); i++) {
- Map updateMap = new HashMap<>();
- updateMap.put("tableName",mainDb);
- //updateMap.put("dataStatus", "Y");
- updateMap.put("addStatus", "1");
- updateMap.put("id", objects.get(i).getString("id"));
- mdmModuleDao.updateMdmSTs(updateMap);
+ if(objects.get(i).getBoolean("sendsanfzt123")){
+ Map updateMap = new HashMap<>();
+ updateMap.put("tableName",mainDb);
+ //updateMap.put("dataStatus", "Y");
+ updateMap.put("addStatus", "1");
+ updateMap.put("id", objects.get(i).getString("id"));
+ mdmModuleDao.updateMdmSTs(updateMap);
+ }
}
}
diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
index 8023f6ec..87fd8fb4 100644
--- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
+++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
@@ -1435,7 +1435,7 @@ public class EncapsulationImpl extends BaseService
List encapsulationEntities = encapsulationDao.queryCgrkddh(encapsulationEntity);
//List encapsulationEntities = new ArrayList<>();
//EncapsulationEntity encapsulationEntity1 = new EncapsulationEntity();
- //encapsulationEntity1.setCode("WW2411080010");
+ //encapsulationEntity1.setCode("WW2411110007");
//encapsulationEntity1.setUnitcode("001");
//encapsulationEntities.add(encapsulationEntity1);
if(encapsulationEntities == null || encapsulationEntities.size() != 1){