字段名称修改

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){
+    public Result<?> getContractinfoByTaskName(String projectId, String taskName){
-        ContractInfoVo rs = contractinfoService.getContractinfoByTaskName(projectid,taskName);
+        ContractInfoVo rs = contractinfoService.getContractinfoByTaskName(projectId,taskName);
         return Result.ok(rs);
     }
 

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<HuzhouContractinfo> contractList = mapper.readValue(contractinfoList, new TypeReference<List<HuzhouContractinfo>>(){});
         planinfofileService.submitPlanUploadFile(files, planinfoid, approvalMoneyFieldsValue, contractMoneyFieldsValue,contractList);

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java

@@ -348,15 +348,15 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
     }
 
     @Override
-    public ContractInfoVo getContractinfoByTaskName(String projectid, String taskName) {
+    public ContractInfoVo getContractinfoByTaskName(String projectId, String taskName) {
         LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
+        queryWrapper.eq(HuzhouContractinfo::getProjectId, projectId);
         queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
         List<HuzhouContractinfo> rs = list(queryWrapper);
         if (rs.size() == 1) {
             // 返回合同信息(计划)
             ContractInfoVo contractInfoVo = new ContractInfoVo();
-            List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectid);
+            List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
             contractInfoVo.setHasInfo(true);
             contractInfoVo.setPlanList(planList);
             return contractInfoVo;
@@ -364,8 +364,8 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
         if (rs.size()>1){
             // 返回计划+ 实际
             ContractInfoVo contractInfoVo = new ContractInfoVo();
-            List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectid);
+            List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
-            List<HuzhouContractinfo> realList = this.getRealContractinfoByprojectId(projectid);
+            List<HuzhouContractinfo> realList = this.getRealContractinfoByprojectId(projectId);
             contractInfoVo.setHasInfo(true);
             contractInfoVo.setPlanList(planList);
             contractInfoVo.setRealList(realList);

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java

@@ -174,25 +174,18 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         }else{
             String projectId = projectinfo.getId();
             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(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("同步更新项目负责人信息:{}",newManagerPhone);
+                log.info("同步更新项目负责人信息:{}",newManager);
             }
 
             List<String> oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo);
@@ -208,6 +201,10 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                 }
             }
             //保存修改记录
+            if("manager".equals(fieldValue)){
+                oldvalue=projectinfo.getManager()+"("+projectinfo.getManagerPhone()+")";
+                newValue=newProjectinfo.getManager()+"("+newProjectinfo.getManagerPhone()+")";
+            }
             HuzhouFieldchangehistory huzhouFieldchangehistory = new HuzhouFieldchangehistory();
             huzhouFieldchangehistory.setId(id);
             huzhouFieldchangehistory.setNewvalue(newValue);