From bc1bf8abcb85390f59d3b64c4dcd46e1dc47db81 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 17 Feb 2025 14:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HuzhouFieldchangehistoryServiceImpl.java  | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

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<HuzhouField
             ProjectManager projectManager = projectManagerService.getProjectManagerInfo(projectId);
             // 如果是修改项目负责人
             if("manager".equals(fieldValue)){
+                //封装修改记录
                 projectinfo.setManager(projectManager.getManager());
                 projectinfo.setManagerPhone(projectManager.getPhone());
-
+                //更新数据库
                 String newManager = newProjectinfo.getManager();
                 String newManagerPhone = newProjectinfo.getManagerPhone();
-                LambdaUpdateWrapper<ProjectManager> 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<ProjectManager> 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<String> oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo);
@@ -318,11 +320,27 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                 updateById(change);
                 String fieldValue = change.getFieldValue();
                 String projectid = change.getProjectid();
+
                 if("projectContacts".equals(fieldValue)){
                     String username = userService.getById(change.getNewvalue()).getUsername();
                     SysUser sysUserByUserName = userService.getSysUserByUserName(username);
                     newProjectinfo.setPhone(sysUserByUserName.getPhoneNumber());
                 }
+                if ("manager".equals(fieldValue)) {
+                    String managerInfo = newProjectinfo.getManager();
+                    int start = managerInfo.indexOf('(');
+                    int end = managerInfo.lastIndexOf(')');
+                    if (start != -1 && end != -1) {
+                        // 提取联系人和联系方式
+                        String newManager = managerInfo.substring(0, start).trim();
+                        String newManagerPhone = managerInfo.substring(start + 1, end).trim();
+                        LambdaUpdateWrapper<ProjectManager> 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<HuzhouField
         List<HuzhouFieldchangehistory> list = list(queryWrapper);
         Map<String, HuzhouFieldchangehistory> nameMap = list.stream().collect(Collectors.toMap(HuzhouFieldchangehistory::getFieldValue, o -> o));
         List<HuzhouFieldchangehistory> result = new ArrayList<>();
-        List<String> sortList = Arrays.asList("projectName","manager","constructionPeriod","superLeader","reformName","workplaceProperties","dutyWorkplace","adminDivision","projectContacts","totalMoney","centralMoney","provincialMoney","cityMoney",
+        // 展示修改的字段集合
+        List<String> 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){