补充提交钉钉转译

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseItemController.java

@@ -88,7 +88,7 @@ public class ExpenseItemController {
                 item.add(userName);
                 item.add(deptName);
             }else {
-                if(dingding!=null&&dingding.getSyncContact()==1){
+                if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     item.add("$userName="+itemVO.getUsername()+"$");
                     item.add("$departmentName="+String.valueOf(itemVO.getCorpDdDeptId())+"$");
                 }else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/GroupBudgetReviewController.java

@@ -251,7 +251,7 @@ public class GroupBudgetReviewController {
             List<String> item=new ArrayList<>();
             item.add(groupBudgetReview.getProjectName());
             item.add(groupBudgetReview.getGroupName());
-            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 Optional<User> first = userList.stream().filter(u -> u.getId().equals(groupBudgetReview.getCreatorId())).findFirst();
                 if(first.isPresent()){
                     item.add("$userName="+first.get().getName()+"$");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectRequirementController.java

@@ -169,7 +169,7 @@ public class ProjectRequirementController {
             String userString = corpwxUseridList.toString();
             resultData.add(pr.getProjectCode());
             resultData.add(pr.getProjectName());
-            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 resultData.add(userString.replaceAll("\\[","").replaceAll("]",""));
             }else {
                 resultData.add(pr.getActiveUsers());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportLogController.java

@@ -56,7 +56,7 @@ public class ReportLogController {
                     String name = item.getName();
                     if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact() == 1){
                         reportLog.setMsg(reportLog.getMsg().replace(name,"$userName=" + item.getCorpwxUserid() + "$"));
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         reportLog.setMsg(reportLog.getMsg().replace(name,"$userName=" + item.getDingdingUserid() + "$"));
                     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskCommentController.java

@@ -87,7 +87,7 @@ public class TaskCommentController {
                 if (item.getId().equals(taskComment.getUserId())){
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         userWxId = item.getCorpwxRealUserid();
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         userWxId = item.getDingdingUserid();
                     }
                     break;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -276,7 +276,7 @@ public class TaskController {
                         .map(TaskExecutor::getId).collect(Collectors.toList());
             List<TaskExecutor> hasRemoveExecutor = oldExeList.stream().filter(old -> !task.getExecutorList().stream().anyMatch(newT -> newT.getId() != null && newT.getId().equals(old.getId()))).collect(Collectors.toList());
             if(hasRemoveExecutor.size()>0){
-                if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+                if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                     taskCommentString.append(",移除了执行人"+hasRemoveExecutor.stream().map(h->{
                         if(!h.getExecutorId().equals(user.getId())){
                             return "$userName="+h.getExecutorName()+"$";
@@ -302,7 +302,7 @@ public class TaskController {
                         .map(TaskExecutor::getExecutorId).collect(Collectors.toList());
                 List<TaskExecutor> newAddExecutor = task.getExecutorList().stream().filter(newT -> !StringUtils.isEmpty(newT.getExecutorId()) && !oldExeList.stream().anyMatch(old -> newT.getExecutorId().equals(old.getExecutorId()))).collect(Collectors.toList());
                 if(newAddExecutor.size()>0){
-                    if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+                    if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                         taskCommentString.append(",新增了执行人"+newAddExecutor.stream().map(h->{
                             if(!h.getExecutorId().equals(user.getId())){
                                 return "$userName="+h.getExecutorName()+"$";
@@ -318,7 +318,7 @@ public class TaskController {
                     Optional<TaskExecutor> first = oldExeList.stream().filter(o -> o.getId().equals(oldHa.getId())).findFirst();
                     if(first.isPresent()){
                         if(!oldHa.getPlanHours().equals(first.get().getPlanHours())){
-                            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+                            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                                 if(oldHa.getExecutorId().equals(user.getId())){
                                     taskCommentString.append(",修改了执行人"+oldHa.getExecutorName()+"计划工时为"+oldHa.getPlanHours()+"小时");
                                 }else {
@@ -1070,7 +1070,7 @@ public class TaskController {
                     }else {
                         row.createCell(2).setCellValue("");
                     }
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(task.getExecutorId())).findFirst();
                     if(first.isPresent()){
                         row.createCell(2).setCellValue("$userName="+(first.get().getDingdingUserid()==null?"":first.get().getDingdingUserid())+"$");
@@ -1130,7 +1130,7 @@ public class TaskController {
                     //httpRespMsg.setError("处理超时...");
                     httpRespMsg.setError(MessageUtils.message("request.outTime"));
                 }
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
                 String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix,user.getDingdingUnionid(),dingding);
                 int i = 0;
@@ -1432,7 +1432,7 @@ public class TaskController {
             String executorString = executorList.stream().map(t->{
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     return "$userName="+t.getExecutorName()+"$";
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     return "$userName="+t.getExecutorName()+"$";
                 }else {
                     return t.getExecutorName();
@@ -1448,7 +1448,7 @@ public class TaskController {
                     if(department.isPresent()){
                         if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                             item.add("$departmentName="+department.get().getCorpwxDeptid()+"$");
-                        }else if(dingding!=null&&dingding.getSyncContact()==1){
+                        }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                             item.add("$departmentName="+department.get().getDdDeptid()+"$");
                         } else {
                             item.add(department.get().getDepartmentName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -403,7 +403,7 @@ public class UserController {
                     row.createCell(0).setCellValue(rowNum);
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         row.createCell(1).setCellValue("$userName="+(item.getCorpwxUserid()==null?" ":item.getCorpwxUserid())+"$");
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         row.createCell(1).setCellValue("$userName="+(item.getDingdingUserid()==null?" ":item.getDingdingUserid())+"$");
                     }else {
                         row.createCell(1).setCellValue(item.getName());
@@ -412,7 +412,7 @@ public class UserController {
                     row.createCell(3).setCellValue(item.getPhone());
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         row.createCell(4).setCellValue("$departmentName="+(item.getCorpwxDeptid()==null?" ":item.getCorpwxDeptid())+"$");
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         if (item.getDepartmentId() != 0) {
                             Optional<Department> first = deptList.stream().filter(d -> d.getDepartmentId().equals(item.getDepartmentId())).findFirst();
                             if(first.isPresent()){
@@ -431,7 +431,7 @@ public class UserController {
                             if(first.isPresent()){
                                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                     row.createCell(5).setCellValue("$userName="+(first.get().getCorpwxUserid()==null?" ":first.get().getCorpwxUserid())+"$");
-                                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                     row.createCell(5).setCellValue("$userName="+(first.get().getDingdingUserid()==null?" ":first.get().getDingdingUserid())+"$");
                                 }else {
                                     row.createCell(5).setCellValue(first.get().getName());
@@ -524,7 +524,7 @@ public class UserController {
                         //httpRespMsg.setError("处理超时...");
                         httpRespMsg.setError(MessageUtils.message("request.outTime"));
                     }
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
                     String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix,user.getDingdingUnionid(), dingding);
                     int i = 0;
@@ -686,7 +686,7 @@ public class UserController {
                     //httpRespMsg.setError("处理超时...");
                     httpRespMsg.setError(MessageUtils.message("request.outTime"));
                 }
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
                 String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix, user.getDingdingUnionid(),dingding);
                 int i = 0;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCorpwxTimeController.java

@@ -303,7 +303,7 @@ public class UserCorpwxTimeController {
             dataList.add((String)dataItem.get("weekDayTxt"));
             if(wxCorpInfo.getSaasSyncContact()==1){
                 dataList.add("$userName="+(String)dataItem.get("corpwxUserid")+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 dataList.add("$userName="+(String)dataItem.get("username")+"$");
             }else{
                 dataList.add((String)dataItem.get("username"));
@@ -385,7 +385,7 @@ public class UserCorpwxTimeController {
             dataList.add(ymonth);
             if(wxCorpInfo.getSaasSyncContact()==1){
                 dataList.add("$userName="+(String)dataItem.get("corpwxUserid")+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 dataList.add("$userName="+(String)dataItem.get("username")+"$");
             }else{
                 dataList.add((String)dataItem.get("username"));
@@ -549,7 +549,7 @@ public class UserCorpwxTimeController {
                 }
                 targetUserList= (List<User>) respMsg.data;
             }
-            if(dingding!=null&&dingding.getSyncContact()==1&&userNameList.size()>0){
+            if(dingding!=null&&dingding.getContactNeedTranslate()==1&&userNameList.size()>0){
                 System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
                 for (String name : userNameList) {
                     respMsg= companyDingdingService.getSearchUserInfo(dingding,name,1);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/CompanyDingdingServiceImpl.java

@@ -601,6 +601,7 @@ public class CompanyDingdingServiceImpl extends ServiceImpl<CompanyDingdingMappe
 
     @Override
     public HttpRespMsg getSearchUserInfo(CompanyDingding dingding, String name, Integer searchType) throws Exception {
+        HttpRespMsg msg=new HttpRespMsg();
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
         config.protocol = "https";
         config.regionId = "central";
@@ -614,7 +615,7 @@ public class CompanyDingdingServiceImpl extends ServiceImpl<CompanyDingdingMappe
                 .setFullMatchField(searchType);
         try {
             SearchUserResponse searchUserResponse = client.searchUserWithOptions(searchUserRequest, searchUserHeaders, new RuntimeOptions());
-            HttpRespMsg msg=new HttpRespMsg();
+            System.out.println("获取到的搜索人员结果：==============>"+searchUserResponse);
             msg.data=searchUserResponse;
             return msg;
         } catch (TeaException err) {
@@ -628,7 +629,8 @@ public class CompanyDingdingServiceImpl extends ServiceImpl<CompanyDingdingMappe
                 // err 中含有 code 和 message 属性，可帮助开发定位问题
             }
         }
-        return null;
+        msg.data=new SearchUserResponse();
+        return msg;
     }
 
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -181,7 +181,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                             String msg = "";
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                 msg = "$userName=" + contractLog.get("operateCorpWxId") + "$" + contractLog.get("msg");
-                            }if(dingding!=null&&dingding.getSyncContact()==1){
+                            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 msg = "$userName=" + contractLog.get("operateName") + "$" + contractLog.get("msg");
                             }else {
                                 msg = contractLog.get("operateName") + "" + contractLog.get("msg");
@@ -267,7 +267,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             item.add(contract.getEndDate()==null?"":contract.getEndDate()+"");
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 contract.setCreatorName("$userName=" + contract.getCreatorWxCorpId() + "$");
-            }if(dingding!=null&&dingding.getSyncContact()==1){
+            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 contract.setCreatorName("$userName=" + contract.getCreatorName() + "$");
             }else {
                 contract.setCreatorName(contract.getCreatorName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -815,7 +815,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     String corpwxUserId = userList.stream().filter(ul -> ul.getId().equals(uid)).findFirst().get().getCorpwxUserid();
                     name ="$userName="+ (corpwxUserId==null?"":corpwxUserId) +"$";
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     String targetName = userList.stream().filter(ul -> ul.getId().equals(uid)).findFirst().get().getName();
                     name ="$userName="+ (targetName==null?"":targetName) +"$";
                 }else {
@@ -1204,7 +1204,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     membRowData.add("$userName="+(String)membMap.get("name")+"$");
                 }else {
-                    if(dingding!=null&&dingding.getSyncContact()==1){
+                    if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         membRowData.add("$userName="+(String)membMap.get("name")+"$");
                     }else {
                         membRowData.add((String)membMap.get("name"));
@@ -1393,7 +1393,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 List<String> item=new ArrayList<>();
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     item.add("$departmentName="+(departmentMasterVO.getCorpwxDeptid()==null?"":departmentMasterVO.getCorpwxDeptid())+"$");
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     item.add("$departmentName="+(departmentMasterVO.getDdDeptid()==null?"":departmentMasterVO.getDdDeptid())+"$");
                 }else {
                     item.add(departmentMasterVO.getDepartmentName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExcelExportServiceImpl.java

@@ -131,7 +131,7 @@ public class ExcelExportServiceImpl implements ExcelExportService {
                 //httpRespMsg.setError("处理超时...");
                 httpRespMsg.setError(MessageUtils.message("request.outTime"));
             }
-        }else if(dingding != null && dingding.getSyncContact() == 1){
+        }else if(dingding != null && dingding.getContactNeedTranslate() == 1){
             User user = userMapper.selectById(request.getHeader("token"));
             String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
             String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix, user.getDingdingUnionid(),dingding);
@@ -218,7 +218,7 @@ public class ExcelExportServiceImpl implements ExcelExportService {
                 //httpRespMsg.setError("处理超时...");
                 httpRespMsg.setError(MessageUtils.message("request.outTime"));
             }
-        }else if(dingding != null && dingding.getSyncContact() == 1){
+        }else if(dingding != null && dingding.getContactNeedTranslate() == 1){
             User user = userMapper.selectById(request.getHeader("token"));
             String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
             String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix, user.getDingdingUnionid(),dingding);
@@ -294,7 +294,7 @@ public class ExcelExportServiceImpl implements ExcelExportService {
                 //httpRespMsg.setError("处理超时...");
                 httpRespMsg.setError(MessageUtils.message("request.outTime"));
             }
-        }else if(dingding != null && dingding.getSyncContact() == 1){
+        }else if(dingding != null && dingding.getContactNeedTranslate() == 1){
             User user = userMapper.selectById(request.getHeader("token"));
             String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
             String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix, user.getDingdingUnionid(),dingding);
@@ -371,7 +371,7 @@ public class ExcelExportServiceImpl implements ExcelExportService {
                 //httpRespMsg.setError("处理超时...");
                 httpRespMsg.setError(MessageUtils.message("request.outTime"));
             }
-        }else if(dingding != null && dingding.getSyncContact() == 1){
+        }else if(dingding != null && dingding.getContactNeedTranslate() == 1){
             User user = userMapper.selectById(request.getHeader("token"));
             String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
             String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix,user.getDingdingUnionid(), dingding);
@@ -446,7 +446,7 @@ public class ExcelExportServiceImpl implements ExcelExportService {
                 //httpRespMsg.setError("处理超时...");
                 httpRespMsg.setError(MessageUtils.message("request.outTime"));
             }
-        }else if(dingding != null && dingding.getSyncContact() == 1){
+        }else if(dingding != null && dingding.getContactNeedTranslate() == 1){
             User user = userMapper.selectById(request.getHeader("token"));
             String mediaId = dingDingService.getTranslationMediaId(fileUrlSuffix,dingding);
             String jobId = dingDingService.syncTranslation(mediaId,fileUrlSuffix,user.getDingdingUnionid(), dingding);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -874,7 +874,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     }
                     targetUserList= (List<User>) respMsg.data;
                 }
-                if(dingding!=null&&dingding.getSyncContact()==1&&userNameList.size()>0){
+                if(dingding!=null&&dingding.getContactNeedTranslate()==1&&userNameList.size()>0){
                     System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
                     for (String name : userNameList) {
                         respMsg= companyDingdingService.getSearchUserInfo(dingding,name,1);
@@ -1191,7 +1191,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 List<String> item=new ArrayList<>();
                 if (wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     item.add("$userName=" + record.getOwnerName() +"$");
-                }else if (dingding!=null&&dingding.getSyncContact()==1){
+                }else if (dingding!=null&&dingding.getContactNeedTranslate()==1){
                     item.add("$userName=" + record.getOwnerName() +"$");
                 }else {
                     item.add(record.getOwnerName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java

@@ -1200,7 +1200,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                             BigDecimal field7 = userFinance.getCustomField7() == null? new BigDecimal(0):userFinance.getCustomField6().multiply(new BigDecimal(workingTime)).divide(userTime.get(creatorId).workingTime, 6, BigDecimal.ROUND_HALF_UP);
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                 membRowData.add("$userName="+(us.getCorpwxUserid()==null?"":us.getCorpwxUserid())+"$");
-                            }if(dingding!=null&&dingding.getSyncContact()==1){
+                            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 membRowData.add("$userName="+us.getName()+"$");
                             }else {
                                 membRowData.add(us.getName());
@@ -1302,7 +1302,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                                     User us = userList.stream().filter(u->u.getId().equals(npu.getUserId())).findFirst().get();
                                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                         membRowData.add("$userName="+(us.getCorpwxUserid()==null?"":us.getCorpwxUserid())+"$");
-                                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                         membRowData.add("$userName="+npu.getName()+"$");
                                     }else {
                                         membRowData.add(npu.getName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/InformationServiceImpl.java

@@ -62,7 +62,7 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
                         if (name.equals(item.getName())){
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                 userWxId = item.getCorpwxRealUserid();
-                            }else if(dingding!=null&&dingding.getSyncContact()==1){
+                            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 userWxId = item.getDingdingUserid();
                             }
                             break;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -606,7 +606,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
                 }else {
                     item.add("");
                 }
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 if (present){
                     User us = userList.stream().filter(ul -> ul.getId().equals(leaveSheet.getOwnerId())).findFirst().get();
                     item.add("$userName="+(us.getDingdingUserid()==null?"":us.getDingdingUserid())+"$");
@@ -658,7 +658,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
             Optional<User> first = userList.stream().filter(u -> u.getId().equals(leaveSheet.getAuditorId())).findFirst();
             String auditorName = first.isPresent()?first.get().getName():"";
             //转译处理
-            if ((wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1)||(dingding != null && dingding.getSyncContact() == 1)) {
+            if ((wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1)||(dingding != null && dingding.getContactNeedTranslate() == 1)) {
                 auditorName = "$userName="+auditorName+"$";
             }
             String statusS = "";

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectApprovalServiceImpl.java

@@ -746,7 +746,7 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
             item.add(record.getProjectName());
             item.add(record.getCategoryName());
             item.add(record.getIsPublic()==0?"正式项目":"非项目");
-            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 item.add("$userName="+(record.getInchargerName()==null?"":record.getInchargerName())+"$");
             }else {
                 item.add(record.getInchargerName()==null?"":record.getInchargerName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectPercentageServiceImpl.java

@@ -220,7 +220,7 @@ public class ProjectPercentageServiceImpl extends ServiceImpl<ProjectPercentageM
                 }
                 targetUserList= (List<User>) respMsg.data;
             }
-            if(dingding!=null&&dingding.getSyncContact()==1&&userNameList.size()>0){
+            if(dingding!=null&&dingding.getContactNeedTranslate()==1&&userNameList.size()>0){
                 System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
                 for (String name : userNameList) {
                     respMsg= companyDingdingService.getSearchUserInfo(dingding,name,1);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1606,7 +1606,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else {
                         membRowData.add((String)("$departmentName="+membMap.get("corpwxDeptId")+"$"));
                     }
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     membRowData.add((String)("$userName="+membMap.get("name")+"$"));
                     if(membMap.get("departmentName").equals("未分配")){
                         membRowData.add("未分配");
@@ -1916,7 +1916,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 }else {
                                     membRowData.add(departmentService.exportWxDepartment(dept,allDepartmentList));
                                 }
-                            }else if(dingding!=null&&dingding.getSyncContact()==1){
+                            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 membRowData.add((String)("$userName="+membMap.get("name")+"$"));
                                 if(membMap.get("departmentName").equals("未分配")){
                                     membRowData.add("未分配");
@@ -2080,7 +2080,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }else {
                             membRowData.add("");
                         }
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         membRowData.add((String)("$userName="+user.getName()+"$"));
                         if(first.isPresent()){
                             membRowData.add((String)("$departmentName="+first.get().getDdDeptid()+"$"));
@@ -2795,7 +2795,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 User incharger = first.get();
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     data.add("$userName="+incharger.getCorpwxUserid()+"$");
-                }if(dingding!=null&&dingding.getSyncContact()==1){
+                }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     data.add("$userName="+incharger.getDingdingUserid()+"$");
                 }else {
                     data.add(incharger.getName());
@@ -2946,7 +2946,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 data.add(task.get("group_real_hours") == null?"":task.get("group_real_hours").toString());
             }
             data.add(task.get("name") != null?task.get("name").toString():"");
-            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 String userName = "";
                 if(task.get("executor_id") != null){
                     String[] executorIds = task.get("executor_id").toString().split(",");
@@ -2956,7 +2956,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         if(first.isPresent()){
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                 userName += "$userName="+(first.get().getCorpwxUserid() == null?"":first.get().getCorpwxUserid())+"$";
-                            }else if(dingding!=null&&dingding.getSyncContact()==1){
+                            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 userName += "$userName="+(first.get().getDingdingUserid() == null?"":first.get().getDingdingUserid())+"$";
                             }
                             if (i < executorIds.length - 1){
@@ -4208,7 +4208,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     rowData.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
                     rowData.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
                     rowData.add("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     rowData.add("$userName="+(String)map.get("username")+"$");
                     rowData.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
                     rowData.add("$departmentName="+rowData.add((String)map.get("departmentName"))+"$");
@@ -4354,7 +4354,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 rowData.add(""+seq);
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     rowData.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     rowData.add("$userName="+(String)map.get("username")+"$");
                 }else {
                     rowData.add((String)map.get("username"));
@@ -4515,7 +4515,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 List<User> targetUserList=new ArrayList<>();
                 HttpRespMsg respMsg=new HttpRespMsg();
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1&&userNameList.size()>0){
-                    System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
+                    System.out.println("企业微信参与搜素的人员列表"+userNameList + userNameList.size());
                     respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList,null);
                     if(respMsg.code.equals("0")){
                         msg.setError("姓名为["+String.valueOf(respMsg.data)+"]的人员存在重复,请使用工号!");
@@ -4523,8 +4523,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                     targetUserList= (List<User>) respMsg.data;
                 }
-                if(dingding!=null&&dingding.getSyncContact()==1&&userNameList.size()>0){
-                    System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
+                if(dingding!=null&&dingding.getContactNeedTranslate()==1&&userNameList.size()>0){
+                    System.out.println("钉钉参与搜素的人员列表"+userNameList + userNameList.size());
                     for (String name : userNameList) {
                         respMsg= companyDingdingService.getSearchUserInfo(dingding,name,1);
                         SearchUserResponse searchUserResponse = (SearchUserResponse) respMsg.data;
@@ -5176,7 +5176,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                     targetUserList= (List<User>) respMsg.data;
                 }
-                if(dingding!=null&&dingding.getSyncContact()==1&&userNameList.size()>0){
+                if(dingding!=null&&dingding.getContactNeedTranslate()==1&&userNameList.size()>0){
                     System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
                     for (String name : userNameList) {
                         respMsg= companyDingdingService.getSearchUserInfo(dingding,name,1);
@@ -6481,7 +6481,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<ProjectCustom> projectCustomList = projectCustomMapper.selectList(new QueryWrapper<ProjectCustom>().eq("company_id", company.getId()));
         List<ProjectCustom> customList = projectCustomList.stream().filter(pl -> pl.getCustomType() != 1).collect(Collectors.toList());
         TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("company_id", company.getId()));
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id, name, corpwx_userid,dingding_userid").eq("company_id", company.getId()));
         List<String> headList = new ArrayList<String>();
 //        headList.add("项目编号");
 //        headList.add("项目分类");
@@ -6601,13 +6601,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             //rowData.add(("1".equals(projectVO.getIsPublic())?"是":"否"));
             rowData.add(("1".equals(projectVO.getIsPublic())?MessageUtils.message("excel.yes"):MessageUtils.message("excel.no")));
             rowData.add(projectVO.getProjectName());
-            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 if(projectVO.getInchargerId()!=null){
                     User us = userList.stream().filter(ul -> ul.getId().equals(projectVO.getInchargerId())).findFirst().get();
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         rowData.add("$userName="+us.getCorpwxUserid()+"$");
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
-                        rowData.add(us.getDingdingUserid()==null?"":"$userName="+us.getDingdingUserid()+"$");
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+                        rowData.add("$userName="+us.getDingdingUserid()+"$");
                     }
                 }else {
                     rowData.add("");
@@ -6624,7 +6624,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else {
                         names+="$userName="+(participator.get(i).getCorpwxUserId())+"$"+",";
                     }
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     if(i==participator.size()-1){
                         names+="$userName="+(participator.get(i).getName())+"$";
                     }else {
@@ -6643,12 +6643,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             rowData.add(start==null?"":sdf.format(start));
             LocalDate end = projectVO.getPlanEndDate();
             rowData.add(end==null?"":sdf.format(end));
-            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(projectVO.getCreatorId())).findFirst();
                 if(first.isPresent()){
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         rowData.add("$userName="+(first.get().getCorpwxUserid()==null?"":first.get().getCorpwxUserid())+"$");
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         rowData.add(first.get().getDingdingUserid()==null?"":"$userName="+(first.get().getDingdingUserid())+"$");
                     }
                 }else {
@@ -6807,7 +6807,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
         CompanyDingding dingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
         //获取全部用户
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("company_id", user.getCompanyId()));
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id, name, corpwx_userid,dingding_userid").eq("company_id", user.getCompanyId()));
         String  projectCategorySub=null;
         if(projectCategorySubId!=null){
             switch (projectCategorySubId){
@@ -6840,12 +6840,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             item.add((String) map.get("projectCode")==null?"":(String)map.get("projectCode"));
             item.add((String) map.get("projectName")==null?"":(String)map.get("projectName"));
             item.add((String) map.get("groupName")==null?"":(String)map.get("groupName"));
-            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                String inchargerId = (String)map.get("inchargerId");
+            String inchargerId = (String)map.get("inchargerId");
+            if((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 if (inchargerId!=null&&!inchargerId.equals("")) {
                     Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(inchargerId)).findFirst();
                     if(incharger.isPresent()){
-                        item.add("$userName="+incharger.get().getCorpwxUserid()+"$");
+                       if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                           item.add("$userName="+incharger.get().getCorpwxUserid()+"$");
+                       }else if(dingding!=null&&dingding.getContactNeedTranslate()==1) {
+                           item.add("$userName="+incharger.get().getDingdingUserid()+"$");
+                       }
                     }else {
                         item.add("");
                     }
@@ -6857,7 +6861,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     asList.forEach(al->{
                         Optional<User> participator = userList.stream().filter(u -> u.getId().equals(al)).findFirst();
                         if(participator.isPresent()){
-                            thisList.add("$userName="+participator.get().getCorpwxUserid()+"$");
+                            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                                thisList.add("$userName="+participator.get().getCorpwxUserid()+"$");
+                            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1) {
+                                thisList.add("$userName="+participator.get().getDingdingUserid()+"$");
+                            }
                         }
                     });
                     item.add(thisList.toString().replaceAll("\\[","").replaceAll("]",""));
@@ -6865,7 +6873,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     item.add("");
                 }
             }else {
-                String inchargerId = (String)map.get("inchargerId");
                 if (inchargerId!=null&&!inchargerId.equals("")) {
                     Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(inchargerId)).findFirst();
                     if (incharger.isPresent()) {
@@ -6993,7 +7000,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                     String s = String.valueOf(membMap.get("corpwxDeptId") == null ? "" : membMap.get("corpwxDeptId"));
                     membRowData.add("$departmentName=" + s + "$");
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(membMap.get("creatorId"))).findFirst();
                     if(first.isPresent()){
                         membRowData.add("$userName="+first.get().getDingdingUserid()+"$");
@@ -7836,7 +7843,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     List<String> membRowData=new ArrayList<>();
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         membRowData.add("$userName"+(user.getCorpwxUserid()==null?"":user.getCorpwxUserid())+"$");
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         membRowData.add("$userName"+(user.getName()==null?"":user.getName())+"$");
                     }else {
                         membRowData.add(user.getName());
@@ -8576,7 +8583,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<String> item=new ArrayList<>();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName="+(timelinessRateVO.getCorpwxUserId()==null?"":timelinessRateVO.getCorpwxUserId())+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$userName="+timelinessRateVO.getUserName()+"$");
             }else {
                 item.add(timelinessRateVO.getUserName());
@@ -8584,7 +8591,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             item.add(timelinessRateVO.getJobNumber());
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$departmentName=" + (timelinessRateVO.getCorpwxDeptId()==null?"":timelinessRateVO.getCorpwxDeptId()) + "$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$departmentName=" + (timelinessRateVO.getCorpDdDeptId()==null?"":timelinessRateVO.getCorpDdDeptId()) + "$");
             }else {
                 item.add(timelinessRateVO.getDepartmentName());
@@ -8848,7 +8855,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
                 item.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
                 item.add("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$userName="+((String) map.get("name"))+"$");
                 item.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
                 item.add("$departmentName="+((String) map.get("departmentName")==null?"":(String) map.get("departmentName"))+"$");
@@ -10332,7 +10339,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName=" + map.get("name") +"$");
                 item.add("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$userName=" + map.get("name") +"$");
                 item.add("$departmentName="+((String) map.get("departmentName")==null?"":(String) map.get("departmentName"))+"$");
             }else {
@@ -10633,7 +10640,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<String> item=new ArrayList<>();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName="+(timelinessRateVO.getCorpwxUserId()==null?"":timelinessRateVO.getCorpwxUserId())+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$userName="+(timelinessRateVO.getUserName())+"$");
             }else {
                 item.add(timelinessRateVO.getUserName());
@@ -10641,7 +10648,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             item.add(timelinessRateVO.getJobNumber());
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$departmentName="+(String.valueOf(timelinessRateVO.getCorpwxDeptId()==null?"":timelinessRateVO.getCorpwxDeptId()))+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$departmentName="+(timelinessRateVO.getDepartmentName())+"$");
             }else {
                 item.add(timelinessRateVO.getDepartmentName());
@@ -11425,7 +11432,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 //                        }else {
 //                            membRowData.add((String)("$departmentName="+membMap.get("corpwxDeptId")+"$"));
 //                        }
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         membRowData.add(("$userName="+(String)membMap.get("name")+"$"));
                     }else {
                         membRowData.add((String)membMap.get("name"));
@@ -11683,7 +11690,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact().equals(1)){
                         item.add("$userName="+map.get("wxUserId") + "$");
                         item.add("$departmentName="+map.get("wxdeptId") + "$");
-                    }else if (dingding != null && dingding.getSyncContact().equals(1)){
+                    }else if (dingding != null && dingding.getContactNeedTranslate().equals(1)){
                         item.add("$userName="+map.get("userName") + "$");
                         item.add("$departmentName="+map.get("departmentName") + "$");
                     }else {
@@ -11710,7 +11717,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact().equals(1)){
                     item.add("$userName="+maps.get(0).get("wxUserId") + "$");
                     item.add("$departmentName="+maps.get(0).get("wxdeptId") + "$");
-                }else if (dingding != null && dingding.getSyncContact().equals(1)){
+                }else if (dingding != null && dingding.getContactNeedTranslate().equals(1)){
                     item.add("$userName="+maps.get(0).get("userName") + "$");
                     item.add("$departmentName="+maps.get(0).get("departmentName") + "$");
                 }else {
@@ -12453,7 +12460,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for (LaborHourRateVo laborHourRateVo : resultList) {
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 list.add("$departmentName="+laborHourRateVo.getDepartment_name()+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 list.add("$departmentName="+laborHourRateVo.getDepartment_name()+"$");
             }else {
                 list.add(laborHourRateVo.getDepartment_name());
@@ -12918,7 +12925,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     list.add("$departmentName="+String.valueOf(maps.get(i).get("corpwxDeptId"))+"$");
                     list.add("$userName="+maps.get(i).get("corpwxUserId")+"$");
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     list.add("$departmentName="+String.valueOf(maps.get(i).get("departmentName"))+"$");
                     list.add("$userName="+String.valueOf(maps.get(i).get("userName"))+"$");
                 }else {
@@ -13412,7 +13419,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             list.add(String.valueOf(map.get("projectCode")));
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 list.add("$departmentName="+map.get("corpwxDeptId")+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 list.add("$departmentName="+String.valueOf(map.get("department_name"))+"$");
             }else {
                 list.add(String.valueOf(map.get("department_name")));
@@ -13622,7 +13629,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if(i==userProgress.size()-1){
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         sb.append("$userName="+String.valueOf(userProgress.get(i).get("userName"))+"$"+String.valueOf(userProgress.get(i).get("progress")));
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         sb.append("$userName="+String.valueOf(userProgress.get(i).get("userName"))+"$"+String.valueOf(userProgress.get(i).get("progress")));
                     }else {
                         sb.append(String.valueOf(userProgress.get(i).get("userName"))+String.valueOf(userProgress.get(i).get("progress")));
@@ -13631,7 +13638,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }else {
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         sb.append("$userName="+String.valueOf(userProgress.get(i).get("userName"))+"$"+String.valueOf(userProgress.get(i).get("progress"))+",");
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         sb.append("$userName="+String.valueOf(userProgress.get(i).get("userName"))+"$"+String.valueOf(userProgress.get(i).get("progress"))+",");
                     }else {
                         sb.append(String.valueOf(userProgress.get(i).get("userName"))+String.valueOf(userProgress.get(i).get("progress"))+",");
@@ -13866,7 +13873,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     list.add("$departmentName="+String.valueOf(maps.get(i).get("corpwxDeptId"))+"$");
                     list.add("$userName="+maps.get(i).get("corpwxUserId")+"$");
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     list.add("$departmentName="+String.valueOf(maps.get(i).get("departmentName"))+"$");
                     list.add("$userName="+String.valueOf(maps.get(i).get("userName"))+"$");
                 }else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -2743,7 +2743,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) {
                 //需要转译
                 sendToUser = "$userName="+user.getCorpwxUserid()+"$";
-            }else if (dingding != null && dingding.getSyncContact() == 1) {
+            }else if (dingding != null && dingding.getContactNeedTranslate() == 1) {
                 //需要转译
                 sendToUser = "$userName="+user.getDingdingUserid()+"$";
             }
@@ -2755,7 +2755,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) {
                 //需要转译
                 sendToUser = "$userName="+user.getCorpwxUserid()+"$";
-            }else if (dingding != null && dingding.getSyncContact() == 1) {
+            }else if (dingding != null && dingding.getContactNeedTranslate() == 1) {
                 //需要转译
                 sendToUser = "$userName="+user.getDingdingUserid()+"$";
             }
@@ -4534,7 +4534,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 dataItem.add("$userName="+(userMonthWork.corpwxUserId==null?"":userMonthWork.corpwxUserId)+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
                 dataItem.add("$departmentName="+(userMonthWork.departmentName==null?"":userMonthWork.departmentName)+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 dataItem.add("$userName="+(userMonthWork.name==null?"":userMonthWork.name)+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
                 dataItem.add("$departmentName="+(userMonthWork.departmentName==null?"":userMonthWork.departmentName)+"$");
             }else {
@@ -5561,7 +5561,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 if(needCorpWxTranslate){
                     item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
                     item.add(departmentService.exportWxDepartment(dept,departments));
-                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     item.add("$userName="+(map.get("name")==null?"":map.get("name"))+"$");
                     item.add(departmentService.exportDdDepartment(dept,departments));
                 }else  {
@@ -5672,7 +5672,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         if(needCorpWxTranslate){
                             String projectAuditorName ="$userName="+String.valueOf(map.get("projectAuditorCorpwxUserId"))+"$";
                             item.add(projectAuditorName);
-                        }else if(dingding!=null&&dingding.getSyncContact()==1){
+                        }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                             String projectAuditorName ="$userName="+(String)map.get("projectAuditorName")+"$";
                             item.add(projectAuditorName);
                         }else {
@@ -5682,7 +5682,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     if(needCorpWxTranslate){
                         String projectManagerName ="$userName="+String.valueOf(map.get("projectManagerCorpwxUserId"))+"$";
                         item.add(projectManagerName);
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         String projectAuditorName ="$userName="+(String)map.get("projectManagerName")+"$";
                         item.add(projectAuditorName);
                     }else {
@@ -5742,7 +5742,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 											msg = time+" " + auditMsg;
 										}
 									}
-								}else if(dingding!=null&&dingding.getSyncContact()==1){
+								}else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                     Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(audit.getOperatorId())).findFirst();
                                     if(first.isPresent()){
                                         String dingdingUserid = first.get().getDingdingUserid();
@@ -5834,7 +5834,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                             } else {
                                                 item.add("待" + departmentName + "(" + deptAuditorName + ")审核");
                                             }
-                                        }else if (dingding!=null&&dingding.getSyncContact()==1) {
+                                        }else if (dingding!=null&&dingding.getContactNeedTranslate()==1) {
                                             String deptAuditorName = "$userName=" + userItem.getDingdingUserid() + "$";
                                             departmentName = "$departmentName=" + departmentName + "$";
                                             if (timeType.getReportAuditType() == 4) {
@@ -5860,12 +5860,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 if (String.valueOf(map.get("projectAuditState")).equals("0") || String.valueOf(map.get("groupAuditState")).equals("0")) {
                                     String projectAuditorName = map.get("projectAuditorName") + "";
                                     String projectAuditorId = map.get("projectAuditorId") + "";
-                                    if (needCorpWxTranslate||(dingding!=null&&dingding.getSyncContact()==1)) {
+                                    if (needCorpWxTranslate||(dingding!=null&&dingding.getContactNeedTranslate()==1)) {
                                         for (User userItem : userList) {
                                             if (userItem.getId().equals(projectAuditorId)) {
                                                 if(needCorpWxTranslate){
                                                     projectAuditorName = "$userName=" + userItem.getCorpwxUserid() + "$";
-                                                }else if(dingding!=null&&dingding.getSyncContact()==1){
+                                                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                                     projectAuditorName = "$userName=" + userItem.getDingdingUserid() + "$";
                                                 }
                                                 item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
@@ -6334,7 +6334,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 line.add("$departmentName="+dataItem.corpwxDeptId+"$");
                 line.add("$userName="+dataItem.corpwxUserId+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 line.add("$departmentName="+dataItem.department+"$");
                 line.add("$userName="+dataItem.name+"$");
             }else {
@@ -8823,7 +8823,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName="+String.valueOf(record.get("corpWxUserId"))+"$");
                 item.add("$departmentName="+String.valueOf(record.get("corpWxDeptId"))+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$userName="+String.valueOf(record.get("userName"))+"$");
                 item.add("$departmentName="+String.valueOf(record.get("deptName"))+"$");
             }else {
@@ -9108,7 +9108,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName="+String.valueOf(map.get("corpwxUserId"))+"$");
                 item.add("$departmentName="+String.valueOf(map.get("corpwxDeptId"))+"$");
-            }else if(dingding!=null&&dingding.getSyncContact()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 item.add("$userName="+String.valueOf(map.get("name"))+"$");
                 item.add("$departmentName="+String.valueOf(map.get("departmentName"))+"$");
             }else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskRestartServiceImpl.java

@@ -154,7 +154,7 @@ public class TaskRestartServiceImpl extends ServiceImpl<TaskRestartMapper, TaskR
                         if(first.get().getCorpwxRealUserid()!=null){
                             personLiableNames.append("$userName="+(first.get().getCorpwxUserid()==null?"":first.get().getCorpwxUserid())+"$"+",");
                         }
-                    }else if(dingding!=null&&dingding.getSyncContact()==1){
+                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         if(first.get().getName()!=null){
                             personLiableNames.append("$userName="+(first.get().getName())+"$"+",");
                         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -319,7 +319,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 }
                 targetUserList= (List<User>) respMsg.data;
             }
-            if(dingding!=null&&dingding.getSyncContact()==1&&userNameList.size()>0){
+            if(dingding!=null&&dingding.getContactNeedTranslate()==1&&userNameList.size()>0){
                 isCorpWxUser = true;
                 System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());
                 for (String name : userNameList) {
@@ -721,7 +721,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         dataList.add(titleList);
         for (Map<String, Object> map : mapList) {
             List<String> item=new ArrayList<>();
-            if((wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getSyncContact()==1)){
+            if((wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1)||(dingding!=null&&dingding.getContactNeedTranslate()==1)){
                 item.add("$userName="+String.valueOf(map.get("userName"))+"$");
                 item.add("$departmentName="+String.valueOf(map.get("deptName"))+"$");
             }else {