Merge branch 'master' into developer

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

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

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

@@ -57,6 +57,15 @@ public interface PreDealService {
      */
     public boolean updateStatusByDataId(String taskId, String dataId, int status, String reason);
 
+    /**
+     * 更新单条数据状态
+     *
+     * @param dataId
+     * @param status
+     * @return
+     */
+    public boolean updateStatusByDataId(String taskId, String dataId,int dataType, int status, String reason);
+
 
     /**
      * 获取任务是否有在同步中

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

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

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

@@ -94,7 +94,7 @@ public class QywxClerkSyncOperation 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(), reason);
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId,PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.exception.getVal(), reason);
         if (!b) {
             logger.info("微信成员处理异常:t:{}, d:{}", taskId, dataId);
             return;
@@ -106,7 +106,7 @@ public class QywxClerkSyncOperation 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,PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
         if (!b) {
             logger.info("微信成功修改错误！{}", dataId);
             return;

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

@@ -161,7 +161,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
     @Override
     public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
         logger.info("部门同步异常：{},{}", taskId, dataId);
-        preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason);
+        preDealService.updateStatusByDataId(taskId, dataId,PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal(), reason);
         logger.info("递归调用更新状态start==:{},d:{}", taskId, dataId);
         changeChildStatus(taskId, dataId, enterpriseId, reason);
         logger.info("递归调用更新状态end==:{},d:{}", taskId, dataId);
@@ -182,7 +182,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
             return;
         }
         child.forEach(tab -> {
-            preDealService.updateStatusByDataId(taskId, tab.getDataId(), PreDealStatusEnum.exception.getVal(), "父分组同步异常");
+            preDealService.updateStatusByDataId(taskId, tab.getDataId(),PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal(), "父分组同步异常");
             changeChildStatus(taskId, tab.getDataId(), enterpriseId, reason);
         });
     }
@@ -221,7 +221,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
             }).collect(Collectors.toList());
             preDealService.insert(preDealLogList);
         }
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId,PreDealTypeEnum.group.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
         if (!b) {
             logger.info("成功修改错误！{}", dataId);
             return;

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

@@ -209,6 +209,9 @@
             update_time = now()
         </set>
         where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
     </update>
 
     <select id="checkTask" resultType="Integer">