|
|
@@ -213,18 +213,24 @@ public class DeptAssessmentDeclarationController {
|
|
|
//Excel导入导出的单元类
|
|
|
List<String[]> strings = ExcelUtil.readData(fileType, startRows, true, is);
|
|
|
//遍历Excel表每一行的数据
|
|
|
+ String assessmentDeclarationId = "";
|
|
|
for (String[] str : strings) {
|
|
|
DeptAssessmentDeclarationContent deptAssessmentDeclarationContent = new DeptAssessmentDeclarationContent();
|
|
|
- deptAssessmentDeclarationContent.setAssessmentDeclarationId(str[0]);
|
|
|
+ if (!"".equals(str[0])) {
|
|
|
+ assessmentDeclarationId = str[0];
|
|
|
+ deptAssessmentDeclarationContent.setAssessmentDeclarationId(str[0]);
|
|
|
+ } else {
|
|
|
+ deptAssessmentDeclarationContent.setAssessmentDeclarationId(assessmentDeclarationId);
|
|
|
+ }
|
|
|
deptAssessmentDeclarationContent.setEmployeeNo(str[1]);
|
|
|
DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(str[0]);
|
|
|
- if (ObjectUtil.isNotNull(deptAssessmentDeclaration)){
|
|
|
+ if (ObjectUtil.isNotNull(deptAssessmentDeclaration)) {
|
|
|
JSONObject jsonArr = userService.pageList(1, 500, deptAssessmentDeclaration.getDeptId(), "", "", "", "", "", request);
|
|
|
JSONObject jsonArr1 = (JSONObject) jsonArr.get("data");
|
|
|
JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
|
|
|
List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
|
|
|
UserDTO user = userList.stream().filter(item -> item.getNo().equals(str[2])).findFirst().orElse(null);
|
|
|
- if (ObjectUtil.isNotNull(user)){
|
|
|
+ if (ObjectUtil.isNotNull(user)) {
|
|
|
deptAssessmentDeclarationContent.setEmployeeId(user.getId());
|
|
|
}
|
|
|
}
|
|
|
@@ -274,7 +280,7 @@ public class DeptAssessmentDeclarationController {
|
|
|
/**
|
|
|
* 生成报表
|
|
|
*
|
|
|
- * @param id 主键
|
|
|
+ * @param id 主键
|
|
|
* @param response response
|
|
|
* @throws Exception 异常
|
|
|
*/
|
hlf