From 83a19f817f0086b2d090de89636eda43e418ec1e Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Fri, 7 Feb 2025 16:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouContractinfoController.java | 4 ++-- .../HuzhouPlaninfofileController.java | 2 +- .../impl/HuzhouContractinfoServiceImpl.java | 10 +++++----- .../HuzhouFieldchangehistoryServiceImpl.java | 19 ++++++++----------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java index a160847..7879dcf 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java @@ -111,8 +111,8 @@ public class HuzhouContractinfoController { } @GetMapping("/getContractinfoByTaskName") - public Result getContractinfoByTaskName(String projectid, String taskName){ - ContractInfoVo rs = contractinfoService.getContractinfoByTaskName(projectid,taskName); + public Result getContractinfoByTaskName(String projectId, String taskName){ + ContractInfoVo rs = contractinfoService.getContractinfoByTaskName(projectId,taskName); return Result.ok(rs); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java index 6152905..e5728bb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java @@ -42,7 +42,7 @@ public class HuzhouPlaninfofileController { MultipartFile[] files, @RequestParam(value = "planinfoid") String planinfoid, @RequestParam(value = "approvalMoneyFieldsValue", required = false) String approvalMoneyFieldsValue, @RequestParam(value = "contractMoneyFieldsValue", required = false) String contractMoneyFieldsValue, - @RequestParam(value = "contractMoneyFieldsValue", required = false) String contractinfoList) throws IOException { + @RequestParam(value = "contractinfoList", required = false) String contractinfoList) throws IOException { ObjectMapper mapper = new ObjectMapper(); List contractList = mapper.readValue(contractinfoList, new TypeReference>(){}); planinfofileService.submitPlanUploadFile(files, planinfoid, approvalMoneyFieldsValue, contractMoneyFieldsValue,contractList); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 90a6dd3..1eadb4b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -348,15 +348,15 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid); + queryWrapper.eq(HuzhouContractinfo::getProjectId, projectId); queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName); List rs = list(queryWrapper); if (rs.size() == 1) { // 返回合同信息(计划) ContractInfoVo contractInfoVo = new ContractInfoVo(); - List planList = this.getContractinfoByprojectId(projectid); + List planList = this.getContractinfoByprojectId(projectId); contractInfoVo.setHasInfo(true); contractInfoVo.setPlanList(planList); return contractInfoVo; @@ -364,8 +364,8 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl1){ // 返回计划+ 实际 ContractInfoVo contractInfoVo = new ContractInfoVo(); - List planList = this.getContractinfoByprojectId(projectid); - List realList = this.getRealContractinfoByprojectId(projectid); + List planList = this.getContractinfoByprojectId(projectId); + List realList = this.getRealContractinfoByprojectId(projectId); contractInfoVo.setHasInfo(true); contractInfoVo.setPlanList(planList); contractInfoVo.setRealList(realList); 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 8d99fd0..e7516ad 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 @@ -174,25 +174,18 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl 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(projectManager.getPhone()); + + String newManager = newProjectinfo.getManager(); String newManagerPhone = newProjectinfo.getManagerPhone(); 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("同步更新项目负责人信息:{}",newManagerPhone); + log.info("同步更新项目负责人信息:{}",newManager); } List oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo); @@ -208,6 +201,10 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl