Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -369,7 +369,7 @@ public class ReportController {
                                   Integer[] sapServiceId,//依斯贝的服务Id
                                   String summary,         //针对工作总结的字段
                                   String[] multiDegrId,
-                                  Integer reportTargetDeptId
+                                  Integer[] reportTargetDeptId
                                     ) {
         List<Report> reportList = new ArrayList<>();
         String token = request.getHeader("Token");
@@ -890,7 +890,7 @@ public class ReportController {
                             report.setStage(stage[i]);
                             report.setCreateDate(localStartDate);
                             report.setCreatorId(token);
-                            report.setDeptId(reportTargetDeptId==null?user.getDepartmentId():reportTargetDeptId);
+                            report.setDeptId(reportTargetDeptId!=null && reportTargetDeptId.length>0?reportTargetDeptId[i]:user.getDepartmentId());
                             report.setProjectAuditState(0);
                             report.setProjectAuditorId(projectAuditorId[i]);
                             report.setTaskFinish(taskFinish[i]);
@@ -1003,7 +1003,7 @@ public class ReportController {
                         report.setPicStr(picStr!=null?picStr[i]:null);
                         report.setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                         report.setCreatorId(token);
-                        report.setDeptId(reportTargetDeptId==null?user.getDepartmentId():reportTargetDeptId);
+                        report.setDeptId(reportTargetDeptId!=null && reportTargetDeptId.length>0?reportTargetDeptId[i]:user.getDepartmentId());
                         report.setProjectAuditState(0);
                         report.setProjectAuditorId(projectAuditorId[i]);
                         report.setTaskFinish(taskFinish[i]);

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

@@ -1198,19 +1198,29 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                             BigDecimal field5 = userFinance.getCustomField5() == null? new BigDecimal(0):userFinance.getCustomField5().multiply(new BigDecimal(workingTime)).divide(userTime.get(creatorId).workingTime, 6, BigDecimal.ROUND_HALF_UP);
                             BigDecimal field6 = userFinance.getCustomField6() == null? new BigDecimal(0):userFinance.getCustomField6().multiply(new BigDecimal(workingTime)).divide(userTime.get(creatorId).workingTime, 6, BigDecimal.ROUND_HALF_UP);
                             BigDecimal field7 = userFinance.getCustomField7() == null? new BigDecimal(0):userFinance.getCustomField6().multiply(new BigDecimal(workingTime)).divide(userTime.get(creatorId).workingTime, 6, BigDecimal.ROUND_HALF_UP);
+                            //增加部门
+                            Optional<Department> findDept = allDepartments.stream().filter(dp -> dp.getDepartmentId().equals(us.getDepartmentId())).findFirst();
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                 membRowData.add("$userName="+(us.getCorpwxUserid()==null?"":us.getCorpwxUserid())+"$");
+                                if (findDept.isPresent()) {
+                                    membRowData.add("$departmentName="+findDept.get().getDepartmentName()+"$");
+                                } else {
+                                    membRowData.add("");
+                                }
                             }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 membRowData.add("$userName="+us.getName()+"$");
+                                if (findDept.isPresent()) {
+                                    membRowData.add("$departmentName="+findDept.get().getDepartmentName()+"$");
+                                } else {
+                                    membRowData.add("");
+                                }
                             }else {
                                 membRowData.add(us.getName());
-                            }
-                            //增加部门
-                            Optional<Department> findDept = allDepartments.stream().filter(dp -> dp.getDepartmentId().equals(us.getDepartmentId())).findFirst();
-                            if (findDept.isPresent()) {
-                                membRowData.add(findDept.get().getDepartmentName());
-                            } else {
-                                membRowData.add("");
+                                if (findDept.isPresent()) {
+                                    membRowData.add(findDept.get().getDepartmentName());
+                                } else {
+                                    membRowData.add("");
+                                }
                             }
                             for (int i = 0; i < userCustoms.size(); i++) {
                                 switch (i){