|
|
@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
import com.easy.admin.auth.model.SysRole; |
|
|
|
import com.easy.admin.auth.model.SysUser; |
|
|
|
import com.easy.admin.auth.service.SysUserService; |
|
|
|
import com.easy.admin.common.core.exception.EasyException; |
|
|
@ -16,25 +15,23 @@ import com.easy.admin.modules.huzhou.service.*; |
|
|
|
import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; |
|
|
|
import com.easy.admin.sys.model.SysDict; |
|
|
|
import com.easy.admin.sys.service.SysDictService; |
|
|
|
import com.easy.admin.util.ShiroUtil; |
|
|
|
import org.activiti.engine.ManagementService; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.activiti.engine.RuntimeService; |
|
|
|
import org.activiti.engine.TaskService; |
|
|
|
import org.activiti.engine.runtime.ProcessInstance; |
|
|
|
import org.activiti.engine.task.Task; |
|
|
|
import org.codehaus.groovy.tools.shell.commands.LoadCommand; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
import java.io.IOException; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@Service |
|
|
|
@Transactional |
|
|
|
@Slf4j |
|
|
|
public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouFieldchangehistoryMapper, HuzhouFieldchangehistory> implements IHuzhouFieldchangehistoryService { |
|
|
|
@Autowired |
|
|
|
private IHuzhouUploadfileinfoService uploadfileinfoService; |
|
|
@ -176,16 +173,28 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField |
|
|
|
} |
|
|
|
}else{ |
|
|
|
String projectId = projectinfo.getId(); |
|
|
|
ProjectManager projectManager = projectManagerService.getById(projectId); |
|
|
|
ProjectManager projectManager = projectManagerService.getProjectManagerInfo(projectId); |
|
|
|
//projectinfo.setManager(projectManager.getManager());
|
|
|
|
if("manager".equals(fieldValue)){ |
|
|
|
projectinfo.setManager(projectManager.getManager()); |
|
|
|
String newManager = newProjectinfo.getManager(); |
|
|
|
LambdaUpdateWrapper<ProjectManager> updateWrapper = new LambdaUpdateWrapper<>(); |
|
|
|
updateWrapper.eq(ProjectManager::getProjectName,projectManager.getProjectName() ); |
|
|
|
updateWrapper.set(ProjectManager::getManager, newManager); |
|
|
|
projectManagerService.update(updateWrapper); |
|
|
|
log.info("同步更新项目负责人信息:{}",newManager); |
|
|
|
} |
|
|
|
if("managerPhone".equals(fieldValue)){ |
|
|
|
//projectinfo.setManagerPhone(projectManager.getPhone());
|
|
|
|
projectinfo.setManagerPhone("18797992302"); |
|
|
|
projectinfo.setManagerPhone(projectManager.getPhone()); |
|
|
|
String newManagerPhone = newProjectinfo.getManagerPhone(); |
|
|
|
LambdaUpdateWrapper<ProjectManager> updateWrapper = new LambdaUpdateWrapper<>(); |
|
|
|
updateWrapper.eq(ProjectManager::getProjectName,projectManager.getProjectName() ); |
|
|
|
updateWrapper.set(ProjectManager::getPhone, newManagerPhone); |
|
|
|
projectManagerService.update(updateWrapper); |
|
|
|
log.info("同步更新项目负责人信息:{}",newManagerPhone); |
|
|
|
} |
|
|
|
//projectinfo.setManagerPhone("18797992307");
|
|
|
|
|
|
|
|
List<String> oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo); |
|
|
|
for (String s:oldstrings) { |
|
|
|
if(s.contains(fieldValue.substring(0,1).toUpperCase()+fieldValue.substring(1))){ |
|
|
|