Skip to content

A
amos-boot-biz
Commit a8f7307e authored by chenzhao's avatar chenzhao
Browse files
Options

修改bug

parent b5f68342
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @ a8f7307e
...@@ -378,30 +378,29 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i ...@@ -378,30 +378,29 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
if (result.size()>0 && result != null){ if (result.size()>0 && result != null){
result.forEach(e-> result.forEach(e->
{ {
Long subInstanceId =Long.parseLong(e.get("parent_id").toString()); /* Long subInstanceId =Long.parseLong(e.get("id").toString());
// Long subInstanceId =Long.parseLong(e.get("instance_id").toString()); // Long subInstanceId =Long.parseLong(e.get("instance_id").toString());
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, subInstanceId); formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, subInstanceId);
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, subInstanceId); formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, subInstanceId);*/
long id1 = Long.parseLong(e.get("id").toString()); long id1 = Long.parseLong(e.get("id").toString());
formInstanceMapper.updateStr(id1 ,e.get("name").toString(),e.get("full_name").toString(),e.get("parent_id").toString(),e.get("code").toString(),bizOrgCode,bizOrgName); formInstanceMapper.updateStr(id1 ,e.get("name").toString(),e.get("full_name").toString(),e.get("parent_id").toString(),e.get("code").toString(),bizOrgCode,bizOrgName);
List<Map<String, Object>> resultSon = formInstanceMapper.getParentId(id1); List<Map<String, Object>> resultSon = formInstanceMapper.getParentId(id1);
if (resultSon.size()>0&& resultSon != null){ if (resultSon.size()>0&& resultSon != null){
resultSon.forEach(r->{ resultSon.forEach(r->{
// Long subInstanceId1 =Long.parseLong(r.get("instance_id").toString()); /* // Long subInstanceId1 =Long.parseLong(r.get("instance_id").toString());
Long subInstanceId1 =Long.parseLong(r.get("parent_id").toString()); Long subInstanceId1 =Long.parseLong(e.get("id").toString());
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, subInstanceId1); formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, subInstanceId1);
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, subInstanceId1); formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, subInstanceId1);*/
long id2 = Long.parseLong(r.get("id").toString()); long id2 = Long.parseLong(r.get("id").toString());
formInstanceMapper.updateStr(id2 ,r.get("name").toString(),r.get("full_name").toString(),r.get("parent_id").toString(),r.get("code").toString(),bizOrgCode,bizOrgName); formInstanceMapper.updateStr(id2 ,r.get("name").toString(),r.get("full_name").toString(),r.get("parent_id").toString(),r.get("code").toString(),bizOrgCode,bizOrgName);
List<Map<String, Object>> resultSons = formInstanceMapper.getParentId(id2); List<Map<String, Object>> resultSons = formInstanceMapper.getParentId(id2);
if (resultSons.size()>0 && !ValidationUtil.isEmpty(resultSons)){ if (resultSons.size()>0 && !ValidationUtil.isEmpty(resultSons)){
resultSons.forEach(z->{ resultSons.forEach(z->{
// Long subInstanceId2 =Long.parseLong(z.get("instance_id").toString()); /* // Long subInstanceId2 =Long.parseLong(z.get("instance_id").toString());
Long subInstanceId2 =Long.parseLong(z.get("parent_id").toString()); Long subInstanceId2 =Long.parseLong(z.get("id").toString());
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, subInstanceId2); formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, subInstanceId2);
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, subInstanceId2); formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, subInstanceId2);*/
long id3 = Long.parseLong(z.get("id").toString()); long id3 = Long.parseLong(z.get("id").toString());
formInstanceMapper.updateStr(id3 ,z.get("name").toString(),z.get("full_name").toString(),z.get("parent_id").toString(),z.get("code").toString(),bizOrgCode,bizOrgName); formInstanceMapper.updateStr(id3 ,z.get("name").toString(),z.get("full_name").toString(),z.get("parent_id").toString(),z.get("code").toString(),bizOrgCode,bizOrgName);
}); });
...@@ -438,8 +437,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i ...@@ -438,8 +437,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
} }
} }
/* 解决bug 5103中修改节点信息之后没有同步修改动态表单的问题 ------by chenhao 2022-03-22 --开始 */ /* 解决bug 5103中修改节点信息之后没有同步修改动态表单的问题 ------by chenhao 2022-03-22 --开始 */
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, instanceId); // formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgCode", bizOrgCode, instanceId);
formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, instanceId); // formInstanceMapper.updateFormInstanceByInstanceAndFieldName("bizOrgName", bizOrgName, instanceId);
/* 解决bug 5103中修改节点信息之后没有同步修改动态表单的问题 ------by chenhao 2022-03-22 -- 结束 */ /* 解决bug 5103中修改节点信息之后没有同步修改动态表单的问题 ------by chenhao 2022-03-22 -- 结束 */
// 发布风险区域同步操作事件 // 发布风险区域同步操作事件
map.put("instanceId", formKeyMap.get("instanceId")); map.put("instanceId", formKeyMap.get("instanceId"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment