diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java index ccfbdcc..f09e1c0 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java @@ -1,5 +1,6 @@ package com.easy.admin.modules.huzhou.service.impl; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -180,17 +181,18 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProjectManager::getProjectName,projectManager.getProjectName() ); - updateWrapper.set(ProjectManager::getManager, newManager); - updateWrapper.set(ProjectManager::getPhone, newManagerPhone); - projectManagerService.update(updateWrapper); - log.info("同步更新项目负责人信息:{}",newManager); +// LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); +// updateWrapper.eq(ProjectManager::getProjectName,projectManager.getProjectName() ); +// updateWrapper.set(ProjectManager::getManager, newManager); +// updateWrapper.set(ProjectManager::getPhone, newManagerPhone); + //projectManagerService.update(updateWrapper); + log.info("需要同步更新项目负责人信息:{}---{}",newManager,newManagerPhone); } List oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo); @@ -318,11 +320,27 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProjectManager::getProjectName, projectManagerService.getProjectManagerInfo(projectid).getProjectName()); + updateWrapper.set(ProjectManager::getManager, newManager); + updateWrapper.set(ProjectManager::getPhone, newManagerPhone); + projectManagerService.update(updateWrapper); + } + } newProjectinfo.setId(projectid); projectinfoMapper.updateById(newProjectinfo); } @@ -366,7 +384,8 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl list = list(queryWrapper); Map nameMap = list.stream().collect(Collectors.toMap(HuzhouFieldchangehistory::getFieldValue, o -> o)); List result = new ArrayList<>(); - List sortList = Arrays.asList("projectName","manager","constructionPeriod","superLeader","reformName","workplaceProperties","dutyWorkplace","adminDivision","projectContacts","totalMoney","centralMoney","provincialMoney","cityMoney", + // 展示修改的字段集合 + List sortList = Arrays.asList("projectName","manager","managerPhone","constructionPeriod","superLeader","reformName","workplaceProperties","dutyWorkplace","adminDivision","projectContacts","totalMoney","centralMoney","provincialMoney","cityMoney", "countyMoney","selfMoney","payamount2023Money","payamount2024Money","payamount2025Money"); for(String name:sortList){ if(nameMap.get(name)!=null){