同步优化初步3-同步成员

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PreDealLogMapper.java

@@ -60,7 +60,7 @@ public interface PreDealLogMapper {
      * @param status
      * @return
      */
-    public int updateStatusByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status);
+    public int updateStatusByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status, @Param("reason") String reason);
 
     /**
      * 校验任务

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/PreDealService.java

@@ -43,7 +43,7 @@ public interface PreDealService {
      * @param status
      * @return
      */
-    public boolean updateStatusByDataId(String taskId, String dataId, int status);
+    public boolean updateStatusByDataId(String taskId, String dataId, int status, String reason);
 
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/PreDealServiceImpl.java

@@ -42,8 +42,8 @@ public class PreDealServiceImpl implements PreDealService {
     }
 
     @Override
-    public boolean updateStatusByDataId(String taskId, String dataId, int status) {
-        int i = preDealLogMapper.updateStatusByDataId(taskId, dataId, status);
+    public boolean updateStatusByDataId(String taskId, String dataId, int status, String reason) {
+        int i = preDealLogMapper.updateStatusByDataId(taskId, dataId, status, reason);
         return i >= 0;
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/ClerkSyncOperation.java

@@ -117,7 +117,7 @@ public class ClerkSyncOperation implements BaseSyncOperation {
     @Override
     public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
         logger.info("成员处理失败：t:{},d:{}", taskId, dataId);
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal());
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason);
         if (!b) {
             logger.info("成员处理异常:t:{}, d:{}", taskId, dataId);
             return;
@@ -129,7 +129,7 @@ public class ClerkSyncOperation implements BaseSyncOperation {
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
         logger.info("成员处理成功：t:{},d:{}", taskId, dataId);
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal());
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
         if (!b) {
             logger.info("成功修改错误！{}", dataId);
             return;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/GroupSyncOperation.java

@@ -65,7 +65,7 @@ public class GroupSyncOperation implements BaseSyncOperation {
         DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(dataPre.getDataId());
         if (departmentDTO != null) {
             logger.info("已经同步过了:{}", dataPre.getDataId());
-            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "该部门不存在");
+            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dealParamMqDTO.getData() + ":该部门不存在");
             return;
         }
 
@@ -80,7 +80,7 @@ public class GroupSyncOperation implements BaseSyncOperation {
         StoreGroupDTO groupDTO = storeGroupService.getStoreGroupById(dealParamMqDTO.getData());
         if (null == groupDTO) {
             logger.info("该部门不存在");
-            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "该部门不存在");
+            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dealParamMqDTO.getData() + ":该部门不存在");
             return;
         }
         DepartmentDTO department = new DepartmentDTO();
@@ -126,14 +126,14 @@ public class GroupSyncOperation implements BaseSyncOperation {
         }
         //todo 需要优化 测试
         for (String id : ids) {
-            preDealService.updateStatusByDataId(taskId, id, PreDealStatusEnum.exception.getVal());
+            preDealService.updateStatusByDataId(taskId, id, PreDealStatusEnum.exception.getVal(), reason);
         }
         checkDepartmentTask(taskId);
     }
 
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal());
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
         if (!b) {
             logger.info("成功修改错误！{}", dataId);
             return;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/StoreSyncOperation.java

@@ -120,13 +120,13 @@ public class StoreSyncOperation implements BaseSyncOperation {
     @Override
     public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
         //处理异常
-        preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal());
+        preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason);
         checkDepartmentTask(taskId);
     }
 
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal());
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
         if (!b) {
             logger.info("成功修改错误！{}", dataId);
             return;

haoban-manage3-service/src/main/resources/mapper/PreDealLogMapper.xml

@@ -175,6 +175,7 @@
         <set>
 
             status_flag = #{status,jdbcType=INTEGER},
+            reason=#{reason},
             update_time = now()
         </set>
         where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}