From 6045a9c0e208f0e2d0f820034faba3972f388659 Mon Sep 17 00:00:00 2001 From: DB <2502523450@qq.com> Date: Sun, 7 Jan 2024 16:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=EF=BC=88=E6=89=80=E6=9C=89=E5=8F=AF=E8=83=BD=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=91=98=E5=B7=A5=E7=9A=84=E5=9C=B0=E6=96=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cpop/oam/web/CpopImportTests.java | 133 +++++++++++++++--- 1 file changed, 111 insertions(+), 22 deletions(-) diff --git a/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopImportTests.java b/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopImportTests.java index 78e3a4c..6c7d96d 100644 --- a/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopImportTests.java +++ b/Cpop-Oam/Cpop-Oam-Web/src/test/java/com/cpop/oam/web/CpopImportTests.java @@ -783,6 +783,9 @@ public class CpopImportTests { if (afterSales != null && iteration != null){ item.put("serviceStaffId",afterSales.getId()); item.put("technologyStaffId",iteration.getId()); + } else { + item.put("serviceStaffId","97819551034630144"); + item.put("technologyStaffId","97819551034630144"); } //时间戳转日期 item.put("dutyDate", item.getLocalDateTime("dutyTime").toLocalDate()); @@ -913,7 +916,7 @@ public class CpopImportTests { Map oldStaffMap = staffRowList.stream().collect(Collectors.toMap(item -> item.getString("staffId"), item -> item.getString("phone"))); //获取现有所有员工 Map staffMap = SpringUtils.getBean(StaffService.class).listAs(QueryWrapper.create() - .select(STAFF.ID, STAFF.NAME) + .select(STAFF.ID, STAFF.NAME, STAFF.USER_ID) .select(SYS_USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)), @@ -925,20 +928,32 @@ public class CpopImportTests { if (StringUtils.isNotBlank(item.getString("staffId")) && oldStaffMap.get(item.getString("staffId")) != null) { if (staffMap.get(oldStaffMap.get(item.getString("staffId"))) != null) { item.put("responsibleStaffId", staffMap.get(oldStaffMap.get(item.getString("staffId"))).getId()); + } else { + item.put("responsibleStaffId", "97819551034630144"); } + } else { + item.put("responsibleStaffId", "97819551034630144"); } //记录员工为创建人 if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { item.put("recordStaffId", staffMap.get(createStaffPhone).getId()); + } else { + item.put("recordStaffId", "97819551034630144"); } + } else { + item.put("recordStaffId", "97819551034630144"); } if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { - item.put("createUserId", staffMap.get(createStaffPhone).getId()); + item.put("createUserId", staffMap.get(createStaffPhone).getUserId()); + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } //文件上传地址格式调整 if (StringUtils.isNotBlank(item.getString("attachmentUrl"))) { @@ -992,7 +1007,7 @@ public class CpopImportTests { Map taskMap = SpringUtils.getBean(TaskService.class).list().stream().collect(Collectors.toMap(BaseEntity::getUpdateUserId, Task::getId)); //获取现有所有员工 Map staffMap = SpringUtils.getBean(StaffService.class).listAs(QueryWrapper.create() - .select(STAFF.ID, STAFF.NAME) + .select(STAFF.ID, STAFF.NAME, STAFF.USER_ID) .select(SYS_USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)), @@ -1002,26 +1017,42 @@ public class CpopImportTests { if (StringUtils.isNotBlank(item.getString("staffId")) && oldStaffMap.get(item.getString("staffId")) != null) { if (staffMap.get(oldStaffMap.get(item.getString("staffId"))) != null) { item.set("staffId", staffMap.get(oldStaffMap.get(item.getString("staffId"))).getId()); + } else { + item.put("staffId", "97819551034630144"); } + } else { + item.put("staffId", "97819551034630144"); } item.put("taskId",taskMap.get(item.getString("iterationId"))); if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { - item.put("createUserId", staffMap.get(createStaffPhone).getId()); + item.put("createUserId", staffMap.get(createStaffPhone).getUserId()); + }else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { - item.put("createUserId", staffMap.get(createStaffPhone).getId()); + item.put("createUserId", staffMap.get(createStaffPhone).getUserId()); + }else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } if (StringUtils.isNotBlank(item.getString("lastModified")) && oldStaffMap.get(item.getString("lastModified")) != null) { String updateStaffPhone = oldStaffMap.get(item.getString("lastModified")); if (staffMap.get(updateStaffPhone) != null) { - item.put("updateUserId", staffMap.get(updateStaffPhone).getId()); + item.put("updateUserId", staffMap.get(updateStaffPhone).getUserId()); + } else { + item.put("updateUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("updateUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } }); List entityList = RowUtil.toEntityList(rowList, TaskStaffGroup.class); @@ -1147,7 +1178,7 @@ public class CpopImportTests { Map oldStaffMap = staffRowList.stream().collect(Collectors.toMap(item -> item.getString("staffId"), item -> item.getString("phone"))); //获取现有所有员工 Map staffMap = SpringUtils.getBean(StaffService.class).listAs(QueryWrapper.create() - .select(STAFF.ID, STAFF.NAME) + .select(STAFF.ID, STAFF.NAME,STAFF.USER_ID) .select(SYS_USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)), @@ -1169,16 +1200,28 @@ public class CpopImportTests { if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { - item.put("createUserId", staffMap.get(createStaffPhone).getId()); - task.setCreateUserId(staffMap.get(createStaffPhone).getId()); - task.setUpdateUserId(staffMap.get(createStaffPhone).getId()); + item.put("createUserId", staffMap.get(createStaffPhone).getUserId()); + task.setCreateUserId(staffMap.get(createStaffPhone).getUserId()); + task.setUpdateUserId(staffMap.get(createStaffPhone).getUserId()); + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setUpdateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setUpdateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); } if (StringUtils.isNotBlank(item.getString("lastModified")) && oldStaffMap.get(item.getString("lastModified")) != null) { String updateStaffPhone = oldStaffMap.get(item.getString("lastModified")); if (staffMap.get(updateStaffPhone) != null) { - item.put("updateUserId", staffMap.get(updateStaffPhone).getId()); + item.put("updateUserId", staffMap.get(updateStaffPhone).getUserId()); + }else { + item.put("updateUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("updateUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } //文件上传地址格式调整 if (StringUtils.isNotBlank(item.getString("attachmentUrl"))) { @@ -1194,7 +1237,11 @@ public class CpopImportTests { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { task.setRecordStaffId(staffMap.get(createStaffPhone).getId()); + }else { + task.setRecordStaffId("97819551034630144"); } + } else { + task.setRecordStaffId("97819551034630144"); } if (StringUtils.isBlank(item.getString("taskRating"))) { // 默认待审核 @@ -1231,16 +1278,28 @@ public class CpopImportTests { if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { - item.put("createUserId", staffMap.get(createStaffPhone).getId()); - task.setCreateUserId(staffMap.get(createStaffPhone).getId()); - task.setUpdateUserId(staffMap.get(createStaffPhone).getId()); + item.put("createUserId", staffMap.get(createStaffPhone).getUserId()); + task.setCreateUserId(staffMap.get(createStaffPhone).getUserId()); + task.setUpdateUserId(staffMap.get(createStaffPhone).getUserId()); + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setUpdateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setUpdateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); } if (StringUtils.isNotBlank(item.getString("lastModified")) && oldStaffMap.get(item.getString("lastModified")) != null) { String updateStaffPhone = oldStaffMap.get(item.getString("lastModified")); if (staffMap.get(updateStaffPhone) != null) { - item.put("updateUserId", staffMap.get(updateStaffPhone).getId()); + item.put("updateUserId", staffMap.get(updateStaffPhone).getUserId()); + } else { + item.put("updateUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("updateUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); } //文件上传地址格式调整 if (StringUtils.isNotBlank(item.getString("attachmentUrl"))) { @@ -1256,7 +1315,11 @@ public class CpopImportTests { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { task.setRecordStaffId(staffMap.get(createStaffPhone).getId()); + }else { + task.setRecordStaffId("97819551034630144"); } + } else { + task.setRecordStaffId("97819551034630144"); } if (taskMap.get(item.getString("iterationId")) != null) { //是否有评级 @@ -1346,7 +1409,7 @@ public class CpopImportTests { Map storeMap = SpringUtils.getBean(StoreService.class).queryChain().list().stream().collect(Collectors.toMap(Store::getId, item -> item)); //获取现有所有员工 Map staffMap = SpringUtils.getBean(StaffService.class).listAs(QueryWrapper.create() - .select(STAFF.ID, STAFF.NAME) + .select(STAFF.ID, STAFF.NAME,STAFF.USER_ID) .select(SYS_USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)), @@ -1359,16 +1422,28 @@ public class CpopImportTests { if (StringUtils.isNotBlank(item.getString("receive")) && oldStaffMap.get(item.getString("receive")) != null) { if (staffMap.get(oldStaffMap.get(item.getString("receive"))) != null) { task.setResponsibleStaffId(staffMap.get(oldStaffMap.get(item.getString("receive"))).getId()); + } else { + task.setResponsibleStaffId("97819551034630144"); } + } else { + task.setResponsibleStaffId("97819551034630144"); } //记录员工为创建人 if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { task.setRecordStaffId(staffMap.get(createStaffPhone).getId()); - task.setCreateUserId(staffMap.get(createStaffPhone).getId()); - task.setUpdateUserId(staffMap.get(createStaffPhone).getId()); + task.setCreateUserId(staffMap.get(createStaffPhone).getUserId()); + task.setUpdateUserId(staffMap.get(createStaffPhone).getUserId()); + }else { + task.setRecordStaffId("97819551034630144"); + task.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setUpdateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + task.setRecordStaffId("97819551034630144"); + task.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + task.setUpdateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); } task.setCreateTime(item.getLocalDateTime("createTime")); task.setUpdateTime(item.getLocalDateTime("updateTime")); @@ -1386,9 +1461,15 @@ public class CpopImportTests { if (StringUtils.isNotBlank(item.getString("creationBy")) && oldStaffMap.get(item.getString("creationBy")) != null) { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { - workOrder.setCreateUserId(staffMap.get(createStaffPhone).getId()); + workOrder.setCreateUserId(staffMap.get(createStaffPhone).getUserId()); workOrder.setFinishStaffId(staffMap.get(createStaffPhone).getId()); + }else { + workOrder.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + workOrder.setFinishStaffId("97819551034630144"); } + } else { + workOrder.setCreateUserId("fb8bc1dcee4040b7b27feaf2789aeef1"); + workOrder.setFinishStaffId("97819551034630144"); } workOrder.setCreateTime(item.getLocalDateTime("createTime")); workOrder.setUpdateTime(item.getLocalDateTime("updateTime")); @@ -1425,7 +1506,7 @@ public class CpopImportTests { Map oldStaffMap = staffRowList.stream().collect(Collectors.toMap(item -> item.getString("staffId"), item -> item.getString("phone"))); //获取现有所有员工 Map staffMap = SpringUtils.getBean(StaffService.class).listAs(QueryWrapper.create() - .select(STAFF.ID, STAFF.NAME) + .select(STAFF.ID, STAFF.NAME,STAFF.USER_ID) .select(SYS_USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)), @@ -1439,9 +1520,17 @@ public class CpopImportTests { String createStaffPhone = oldStaffMap.get(item.getString("creationBy")); if (staffMap.get(createStaffPhone) != null) { item.put("recordStaffId", staffMap.get(createStaffPhone).getId()); - item.put("createUserId", staffMap.get(createStaffPhone).getId()); - item.put("updateUserid", staffMap.get(createStaffPhone).getId()); + item.put("createUserId", staffMap.get(createStaffPhone).getUserId()); + item.put("updateUserid", staffMap.get(createStaffPhone).getUserId()); + }else { + item.put("recordStaffId", "97819551034630144"); + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); + item.put("updateUserid", "fb8bc1dcee4040b7b27feaf2789aeef1"); } + } else { + item.put("recordStaffId", "97819551034630144"); + item.put("createUserId", "fb8bc1dcee4040b7b27feaf2789aeef1"); + item.put("updateUserid", "fb8bc1dcee4040b7b27feaf2789aeef1"); } if (StringUtils.isNotBlank(item.getString("attachmentUrl"))){ Map map = new HashMap<>();