From 7fab26854a6bbcb970d00e9a0161f1ba86c14969 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Fri, 13 Dec 2024 17:35:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E5=80=99=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81add=5Fstatus=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comparison/service/impl/ComparisonServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java index 12f50559..3a089f75 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -485,6 +485,7 @@ public class ComparisonServiceImpl extends BaseService map.put("modify_time", new Date()); map.put("sts", "Y"); map.put("data_status","F");//数据状态 + map.put("add_status", "0");//新增状态 map.put("update_status","0");//修改状态 map.remove("id"); comparisonEntity.setMap(map); @@ -622,10 +623,10 @@ public class ComparisonServiceImpl extends BaseService return BaseResult.getFailureMessageEntity("根据data_id查询id数据为空，请检查data_id"); } - //递归删除树结构 1.树 2.列表 + /*//递归删除树结构 1.树 2.列表 if(comparisonEntities.get(0).getViewName().equals("1")){ return recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity); - } + }*/ String id = String.valueOf(comparisonEntitiePages.get(0).get("id")); From 49a157ea2890ba0a32f89df634df37ad2ae4573a Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Thu, 19 Dec 2024 09:54:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/MdmModulePluginInitializer.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 beb4c48e..822cfcb2 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 @@ -544,7 +544,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { map1.put("tableName",mainDb); map1.put("dataStatus", "N"); map1.put("deleteStatus", "0"); - map1.put("size", 50); + map1.put("size", 10); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); @@ -739,7 +739,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { map1.put("tableName",mainDb); //map1.put("dataStatus", "F"); map1.put("updateStatus", "0"); - map1.put("size", 50); + map1.put("size", 10); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); @@ -927,7 +927,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { map1.put("tableName",mainDb); //map1.put("dataStatus", "Y"); map1.put("addStatus", "0"); - map1.put("size", 50); + map1.put("size", 10); objects = mdmModuleDao.queryMdmSTs(map1); objects = toLowerCaseKeys(objects); @@ -965,14 +965,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { for (int i = 0; i < doObjects.size(); i++) { saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","新增接口未查找到",mainDb,objects.get(i).getString("id"),null,null,null,null,doObjects.get(i).toJSONString(),"1"); } - return ; + continue ; } SysApplicationEntity sysApplicationEntity = sysApplicationDao.get(apiEntity.getAppId()); if(sysApplicationEntity == null || sysApplicationEntity.getId() == null ){ for (int i = 0; i < doObjects.size(); i++) { saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","应用未查找到",mainDb,objects.get(i).getString("id"),null,null,apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1"); } - return ; + continue ; } SysApplicationScriptEntity scriptEntity = null; @@ -982,7 +982,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { for (int i = 0; i < doObjects.size(); i++) { saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","脚本未查找到",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1"); } - return ; + continue ; } } @@ -1136,14 +1136,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { //所有下发发送完成，修改数据状态 for (int i = 0; i < objects.size(); i++) { - if(objects.get(i).getBoolean("sendsanfzt123")){ + //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); - } + //} } } From 1933f96229556e1fff41f3fda0f1b50d0fd82918 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Fri, 20 Dec 2024 11:29:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java index 889ba344..ec219ac4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java @@ -285,7 +285,7 @@ private IFormmain0044Service formmain0044Service; if (CollectionUtils.isNotEmpty(formmain0044List) && CollectionUtils.isNotEmpty(accTransactionResList)){ accTransactionResList = accTransactionResList.stream() .filter(acc -> formmain0044List.stream() - .noneMatch(f -> acc.getSerialId().equals(f.getField0018()))) + .noneMatch(f -> acc.getSerialId().equals(f.getField0019()))) .collect(Collectors.toList()); } if (CollectionUtils.isNotEmpty(accTransactionResList)){