diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java index 9812f1abbc..22264424a2 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java @@ -40,4 +40,7 @@ public class ImportTaskCommonResultDTO implements Serializable { */ private String resultDescFile; + private Integer successItemsQty; + private Integer failItemsQty; + } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java index d1d43b148b..5519578120 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java @@ -21,6 +21,19 @@ public class ImportTaskController { @Autowired private ImportTaskService importTaskService; + /** + * @description: 通过id查找 + * @param taskId: + * @return + * @author: WangXianZhang + * @date: 2023/4/20 2:17 PM + */ + @RequestMapping("/getById") + public Result getById(@RequestParam("taskId") String taskId) { + ImportTaskCommonResultDTO r = importTaskService.getById(taskId); + return new Result().ok(r); + } + /** * desc:分页获取个人导入记录 * @param tokenDto diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java index 0602a42963..756d5a7937 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java @@ -54,4 +54,7 @@ public class ImportTaskEntity extends BaseEpmetEntity { private String resultDesc; + private Integer successItemsQty; + private Integer failItemsQty; + } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java index bb1acf5c36..74ceb6a3f4 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java @@ -52,4 +52,6 @@ public interface ImportTaskService { * @return */ Boolean processingTaskCheck(String bizType); + + ImportTaskCommonResultDTO getById(String taskId); } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java index f81e4cc949..6d37dab168 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java @@ -121,4 +121,12 @@ public class ImportTaskServiceImpl implements ImportTaskService { return importRecordDao.selectCount(query) > 0; } + + @Override + public ImportTaskCommonResultDTO getById(String taskId) { + ImportTaskEntity task = importRecordDao.selectById(taskId); + ImportTaskCommonResultDTO r = ConvertUtils.sourceToTarget(task, ImportTaskCommonResultDTO.class); + r.setTaskId(taskId); + return r; + } } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml index df58afb615..8c17d0d858 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml @@ -12,6 +12,8 @@ + +