日报导出增加人员自定义配置相关数据

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

@@ -126,6 +126,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Resource
     private CompanyMapper companyMapper;
     @Resource
+    private UserCustomMapper userCustomMapper;
+    @Resource
     private ReportMapper reportMapper;
     @Resource
     private ParticipationMapper participationMapper;
@@ -3537,6 +3539,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             TimeType timeType = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", user.getCompanyId()));
             Company company = companyMapper.selectById(user.getCompanyId());
             Integer companyId = company.getId();
+            List<UserCustom> userCustomList = userCustomMapper.selectList(new QueryWrapper<UserCustom>().eq("company_id", companyId));
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             //准备导出
@@ -3555,6 +3558,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             titles.add(MessageUtils.message("entry.serialNo"));
             titles.add(MessageUtils.message("entry.No"));
             titles.add(MessageUtils.message("excel.staff"));
+            for (int i = 0; i < userCustomList.size(); i++) {
+                titles.add(userCustomList.get(i).getName());
+            }
             titles.add(MessageUtils.message("entry.department"));
             titles.add(MessageUtils.message("entry.projectId"));
             titles.add(MessageUtils.message("entry.projectName"));
@@ -3774,34 +3780,53 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     map.put("time", DateTimeUtil.localDateTimeToDate(time));
 
                     //审核时间
-                    String projectAuditTime = sdf.format((Date)map.get("projectAuditTime"));
-                    LocalDateTime auditTime = LocalDateTime.parse(projectAuditTime, dtf);
-                    auditTime = auditTime.plusSeconds(offsetSeconds);
-                    map.put("projectAuditTime", DateTimeUtil.localDateTimeToDate(auditTime));
+                    if(map.get("projectAuditTime")!=null){
+                        String projectAuditTime = sdf.format((Date)map.get("projectAuditTime"));
+                        LocalDateTime auditTime = LocalDateTime.parse(projectAuditTime, dtf);
+                        auditTime = auditTime.plusSeconds(offsetSeconds);
+                        map.put("projectAuditTime", DateTimeUtil.localDateTimeToDate(auditTime));
+                    }else  map.put("projectAuditTime","");
+
                 }
             }
             for (Map<String, Object> map : allReportByDate) {
                 HSSFRow row = sheet.createRow(rowNum);
                 row.createCell(0).setCellValue(rowNum);
                 row.createCell(1).setCellValue((String) map.get("jobNumber"));
+                for (int i = 0; i < userCustomList.size(); i++) {
+                    String value="";
+                    switch (i){
+                        case 0:value=String.valueOf(map.get("plate1")==null?"":map.get("plate1"));
+                            break;
+                        case 1:value=String.valueOf(map.get("plate2")==null?"":map.get("plate2"));
+                            break;
+                        case 2:value=String.valueOf(map.get("plate3")==null?"":map.get("plate3"));
+                            break;
+                        case 3:value=String.valueOf(map.get("plate4")==null?"":map.get("plate4"));
+                            break;
+                        case 4:value=String.valueOf(map.get("plate5")==null?"":map.get("plate5"));
+                            break;
+                    }
+                    row.createCell(3+i).setCellValue(value);
+                }
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     row.createCell(2).setCellValue("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
-                    row.createCell(3).setCellValue("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
+                    row.createCell(3+userCustomList.size()).setCellValue("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
                 }else {
                     row.createCell(2).setCellValue((String) map.get("name"));
-                    row.createCell(3).setCellValue((String) map.get("departmentName"));
+                    row.createCell(3+userCustomList.size()).setCellValue((String) map.get("departmentName"));
                 }
-                row.createCell(4).setCellValue((String) map.get("projectCode"));
-                row.createCell(5).setCellValue((String) map.get("project"));
-                row.createCell(6).setCellValue((String) map.get("categoryName"));
+                row.createCell(4+userCustomList.size()).setCellValue((String) map.get("projectCode"));
+                row.createCell(5+userCustomList.size()).setCellValue((String) map.get("project"));
+                row.createCell(6+userCustomList.size()).setCellValue((String) map.get("categoryName"));
                 if(timeType.getMainProjectState()==1){
-                    row.createCell(7).setCellValue((String) map.get("projectMainName"));
+                    row.createCell(7+userCustomList.size()).setCellValue((String) map.get("projectMainName"));
                 }else {
-                    row.createCell(7).setCellValue((String) map.get("subProjectName"));
+                    row.createCell(7+userCustomList.size()).setCellValue((String) map.get("subProjectName"));
                 }
-                int index = 8;
+                int index = 8+userCustomList.size();
                 if (company.getPackageProject() == 1) {
-                    row.createCell(8).setCellValue((String) map.get("taskName"));
+                    row.createCell(8+userCustomList.size()).setCellValue((String) map.get("taskName"));
                     index++;
                 }
                 HSSFCell cell = row.createCell(index);
@@ -4713,7 +4738,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         LocalDate endDate = LocalDate.parse(dateStr,df);
         endDate=endDate.plusMonths(1);
         List<Map<String,Object>> resultList=reportMapper.getUploadThirdReportData(companyId,startDate,endDate);
-        String url="http://116.236.135.252:18009/dataservice/apiInfo/queryData/test/sap/sysLaborhour";
+        String url="http://10.20.35.48:8009/dataservice/apiInfo/queryData/prd/sap/sysLaborhour";
         //认证的账号和密码
         HttpHeaders headers=new HttpHeaders();
         JSONObject param = new JSONObject();

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

@@ -1710,6 +1710,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             String userId = request.getHeader("Token");
             User user = userMapper.selectById(userId);
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+            List<UserCustom> userCustomList = userCustomMapper.selectList(new QueryWrapper<UserCustom>().eq("company_id", user.getCompanyId()));
             //准备导出
             HSSFWorkbook workbook = new HSSFWorkbook();
             //HSSFSheet sheet = workbook.createSheet("全部员工列表");
@@ -1766,7 +1767,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //headCell.setCellValue("证书");
             headCell.setCellValue(MessageUtils.message("excel.certificate"));
             headCell.setCellStyle(headStyle);
-            headCell = headRow.createCell(8);
+            for (int i = 0; i < userCustomList.size(); i++) {
+                headCell = headRow.createCell(8+i);
+                headCell.setCellValue(userCustomList.get(i).getName());
+                headCell.setCellStyle(headStyle);
+            }
+            headCell = headRow.createCell(8+userCustomList.size());
             //headCell.setCellValue("状态");
             headCell.setCellValue(MessageUtils.message("leave.status"));
             headCell.setCellStyle(headStyle);
@@ -1826,7 +1832,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }else {
                     row.createCell(7).setCellValue("");
                 }
-                row.createCell(8).setCellValue(item.getIsActive()==1?MessageUtils.message("excel.normal"):MessageUtils.message("access.deactivated"));
+                for (int i = 0; i < userCustomList.size(); i++) {
+                    String value="";
+                    switch (i){
+                        case 0:value=item.getPlate1()==null?"":item.getPlate1();
+                            break;
+                        case 1:value=item.getPlate2()==null?"":item.getPlate2();
+                            break;
+                        case 2:value=item.getPlate3()==null?"":item.getPlate3();
+                            break;
+                        case 3:value=item.getPlate4()==null?"":item.getPlate4();
+                            break;
+                        case 4:value=item.getPlate5()==null?"":item.getPlate5();
+                            break;
+                    }
+                    row.createCell(8+i).setCellValue(value);
+                }
+                row.createCell(8+userCustomList.size()).setCellValue(item.getIsActive()==1?MessageUtils.message("excel.normal"):MessageUtils.message("access.deactivated"));
                 rowNum++;
             }
             //生成Excel文件

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -61,6 +61,7 @@
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType,a.start_time as startTime,u.job_number as jobNumber,
         a.end_time  as endTime, d.name as subProjectName,d.code as subProjectCode,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
+        ,c.plate1 as plate1,c.plate2 as plate2,c.plate3 as plate3,c.plate4 as plate4,c.plate5 as plate5
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId,a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as departmentName,department.department_id as departmentId, a.overtime_hours as overtimeHours, a.custom_text as customText,a.project_audit_time  as projectAuditTime,project_main.name as projectMainName
         FROM report AS a
@@ -141,6 +142,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as
         degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId,
         a.custom_data as customData
+        ,c.plate1 as plate1,c.plate2 as plate2,c.plate3 as plate3,c.plate4 as plate4,c.plate5 as plate5
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as
         departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as
         projectAuditTime,project_main.name as projectMainName
@@ -189,6 +191,7 @@
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType, a.start_time as startTime,
         a.end_time as endTime, d.name as subProjectName,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState,a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
+        ,c.plate1 as plate1,c.plate2 as plate2,c.plate3 as plate3,c.plate4 as plate4,c.plate5 as plate5
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as projectAuditTime,project_main.name as projectMainName
         FROM report AS a