|
|
@@ -1865,11 +1865,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
sheet.setColumnWidth(2, 20 * 256);
|
|
|
sheet.setColumnWidth(3, 20 * 256);
|
|
|
sheet.setColumnWidth(4, 20 * 256);
|
|
|
- sheet.setColumnWidth(5, 10 * 256);
|
|
|
-
|
|
|
+ sheet.setColumnWidth(5, 20 * 256);
|
|
|
sheet.setColumnWidth(6, 10 * 256);
|
|
|
+
|
|
|
sheet.setColumnWidth(7, 10 * 256);
|
|
|
sheet.setColumnWidth(8, 10 * 256);
|
|
|
+ sheet.setColumnWidth(9, 10 * 256);
|
|
|
//设置为居中加粗
|
|
|
HSSFCellStyle headStyle = workbook.createCellStyle();
|
|
|
HSSFFont font = workbook.createFont();
|
|
|
@@ -1890,22 +1891,26 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
headCell.setCellValue(MessageUtils.message("role.role"));
|
|
|
headCell.setCellStyle(headStyle);
|
|
|
headCell = headRow.createCell(3);
|
|
|
+ //headCell.setCellValue("工种");
|
|
|
+ headCell.setCellValue("工种");
|
|
|
+ headCell.setCellStyle(headStyle);
|
|
|
+ headCell = headRow.createCell(4);
|
|
|
//headCell.setCellValue("手机号");
|
|
|
headCell.setCellValue(MessageUtils.message("excel.phoneNumber"));
|
|
|
headCell.setCellStyle(headStyle);
|
|
|
- headCell = headRow.createCell(4);
|
|
|
+ headCell = headRow.createCell(5);
|
|
|
//headCell.setCellValue("部门");
|
|
|
headCell.setCellValue(MessageUtils.message("excel.department"));
|
|
|
headCell.setCellStyle(headStyle);
|
|
|
- headCell = headRow.createCell(5);
|
|
|
+ headCell = headRow.createCell(6);
|
|
|
//headCell.setCellValue("月薪");
|
|
|
headCell.setCellValue(MessageUtils.message("excel.MonSalary"));
|
|
|
headCell.setCellStyle(headStyle);
|
|
|
- headCell = headRow.createCell(6);
|
|
|
+ headCell = headRow.createCell(7);
|
|
|
//headCell.setCellValue("时薪");
|
|
|
headCell.setCellValue(MessageUtils.message("excel.hourlyWage"));
|
|
|
headCell.setCellStyle(headStyle);
|
|
|
- headCell = headRow.createCell(7);
|
|
|
+ headCell = headRow.createCell(8);
|
|
|
//headCell.setCellValue("证书");
|
|
|
headCell.setCellValue(MessageUtils.message("excel.certificate"));
|
|
|
headCell.setCellStyle(headStyle);
|
|
|
@@ -1952,14 +1957,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
row.createCell(1).setCellValue(item.getName());
|
|
|
}
|
|
|
row.createCell(2).setCellValue(item.getRoleName());
|
|
|
- row.createCell(3).setCellValue(item.getPhone());
|
|
|
+ row.createCell(3).setCellValue(item.getWorkType());
|
|
|
+ row.createCell(4).setCellValue(item.getPhone());
|
|
|
if(wxCorpInfo!=null&&!isPrivateDeploy){
|
|
|
- row.createCell(4).setCellValue("$departmentName="+(item.getCorpwxDeptid()==null?" ":item.getCorpwxDeptid())+"$");
|
|
|
+ row.createCell(5).setCellValue("$departmentName="+(item.getCorpwxDeptid()==null?" ":item.getCorpwxDeptid())+"$");
|
|
|
}else {
|
|
|
- row.createCell(4).setCellValue(item.getDepartmentName());
|
|
|
+ row.createCell(5).setCellValue(item.getDepartmentName());
|
|
|
}
|
|
|
- row.createCell(5).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
|
|
|
- row.createCell(6).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
|
|
|
+ row.createCell(6).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
|
|
|
+ row.createCell(7).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
|
|
|
List<UserCert> certList = userCertList.stream().distinct().filter(uc -> uc.getUserId().equals(item.getId())).collect(Collectors.toList());
|
|
|
if(certList.size()>0){
|
|
|
String s="";
|
|
|
@@ -1970,9 +1976,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate();
|
|
|
}
|
|
|
}
|
|
|
- row.createCell(7).setCellValue(s);
|
|
|
+ row.createCell(8).setCellValue(s);
|
|
|
}else {
|
|
|
- row.createCell(7).setCellValue("");
|
|
|
+ row.createCell(8).setCellValue("");
|
|
|
}
|
|
|
for (int i = 0; i < userCustomList.size(); i++) {
|
|
|
String value="";
|
