Merge branch 'wxz_importtask_addnumber' into lingshan_master

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ImportTaskCommonFormDTO.java

@@ -56,4 +56,14 @@ public class ImportTaskCommonFormDTO extends PageFormDTO {
      */
     private String resultDesc;
 
+    /**
+     * 成功行数
+     */
+    private Integer successItemsQty;
+
+    /**
+     * 失败行数
+     */
+    private Integer failItemsQty;
+
 }

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java

@@ -21,11 +21,17 @@ public class ImportTaskUtils implements ResultDataResolver {
      * @return Result
      */
     public static Result<ImportTaskCommonResultDTO> createImportTask(String originFileName, String bizType) {
+        return createImportTask(originFileName, bizType, null, null);
+    }
+
+    public static Result<ImportTaskCommonResultDTO> createImportTask(String originFileName, String bizType,
+                                                                     Integer successItemsQty, Integer failItemsQty) {
         ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
         form.setOriginFileName(originFileName);
         form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
         form.setBizType(bizType);
-
+        form.setSuccessItemsQty(successItemsQty);
+        form.setFailItemsQty(failItemsQty);
         return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form);
     }
 

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java

@@ -59,7 +59,13 @@ public class ImportTaskController {
     @RequestMapping("finish")
     public Result finishTask(@RequestBody ImportTaskCommonFormDTO input) {
         ValidatorUtils.validateEntity(input, ImportTaskCommonFormDTO.Finish.class);
-        Boolean finished = importTaskService.finish(input.getTaskId(), input.getProcessStatus(), input.getOperatorId(), input.getResultDescFilePath(), input.getResultDesc());
+        Boolean finished = importTaskService.finish(input.getTaskId(),
+                input.getProcessStatus(),
+                input.getOperatorId(),
+                input.getResultDescFilePath(),
+                input.getResultDesc(),
+                input.getSuccessItemsQty(),
+                input.getFailItemsQty());
         if (!finished) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                     "失败，请确认任务是否存在，以及是否已完成",

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ImportTaskDao.java

@@ -24,8 +24,10 @@ public interface ImportTaskDao extends BaseDao<ImportTaskEntity> {
 	 * @return
 	 */
 	int finish(@Param("taskId") String taskId,
-				 @Param("process_status") String processStatus,
-				 @Param("operatorId") String operatorId,
-				 @Param("resultDesc") String resultDesc,
-				 @Param("resultDescFile") String resultDescFile);
+			   @Param("process_status") String processStatus,
+			   @Param("operatorId") String operatorId,
+			   @Param("resultDesc") String resultDesc,
+			   @Param("resultDescFile") String resultDescFile,
+			   @Param("successItemsQty") Integer successItemsQty,
+			   @Param("failItemsQty") Integer failItemsQty);
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java

@@ -36,7 +36,8 @@ public interface ImportTaskService {
      * @param resultDescFile 结果描述文件
      * @param resultDesc 结果描述文本
      */
-    Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc);
+    Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc,
+                   Integer successItemsQty, Integer failItemsQty);
 
     /**
      * desc：分页获取个人导入记录

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java

@@ -89,8 +89,9 @@ public class ImportTaskServiceImpl implements ImportTaskService {
     }
 
     @Override
-    public Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc) {
-        return importRecordDao.finish(taskId, processStatus, operatorId, resultDesc, resultDescFile) > 0;
+    public Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc,
+                Integer successItemsQty, Integer failItemsQty) {
+        return importRecordDao.finish(taskId, processStatus, operatorId, resultDesc, resultDescFile, successItemsQty, failItemsQty) > 0;
     }
 
     @Override

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.15__importtask_add_number.sql

@@ -0,0 +1,2 @@
+alter table import_task add column SUCCESS_ITEMS_QTY int comment '成功条数' after RESULT_DESC;
+alter table import_task add column FAIL_ITEMS_QTY int comment '失败条数' after SUCCESS_ITEMS_QTY;

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml

@@ -26,6 +26,8 @@
         set PROCESS_STATUS = #{process_status},
             RESULT_DESC = #{resultDesc},
             RESULT_DESC_FILE = #{resultDescFile},
+            SUCCESS_ITEMS_QTY = #{successItemsQty},
+            FAIL_ITEMS_QTY = #{failItemsQty},
             UPDATED_BY=#{operatorId},
             UPDATED_TIME=NOW()
         where ID=#{taskId}