Merge branch 'master' into developer

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

@@ -45,7 +45,7 @@ public interface PreDealLogMapper {
      * @param dataId
      * @return
      */
-    List<TabHaobanPreDealLog> getByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status);
+    List<TabHaobanPreDealLog> getByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId,@Param("dataType") int dataType, @Param("status") int status);
 
     /**
      * 获取单条数据

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

@@ -28,7 +28,7 @@ public interface PreDealService {
      * @param dataId
      * @return
      */
-    public TabHaobanPreDealLog getByDataId(String taskId, String dataId, int status);
+    public TabHaobanPreDealLog getByDataId(String taskId, String dataId,int dataType, int status);
 
     /**
      * 根据父数据id 获取子节点

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

@@ -39,8 +39,8 @@ public class PreDealServiceImpl implements PreDealService {
     }
 
     @Override
-    public TabHaobanPreDealLog getByDataId(String taskId, String dataId, int status) {
-        List<TabHaobanPreDealLog> list = preDealLogMapper.getByDataId(taskId, dataId, status);
+    public TabHaobanPreDealLog getByDataId(String taskId, String dataId,int dataType, int status) {
+        List<TabHaobanPreDealLog> list = preDealLogMapper.getByDataId(taskId, dataId,dataType, status);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         } else {

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

@@ -107,7 +107,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         logger.info("mq处理中:{}", params);
         DealParamMqDTO dealParamMqDTO = JSONObject.parseObject(params, DealParamMqDTO.class);
         TabHaobanPreDealLog dataPre = preDealService.getByDataId(dealParamMqDTO.getTaskId()
-                , dealParamMqDTO.getData(), PreDealStatusEnum.all.getVal());
+                , dealParamMqDTO.getData(),dealParamMqDTO.getType()-1, PreDealStatusEnum.all.getVal());
 
         if (dataPre == null) {
             logger.info("待处理数据不存在:{}", params);

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

@@ -180,6 +180,9 @@
         <if test="status!=-1">
             and status_flag=#{status}
         </if>
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
     </select>
 
     <select id="listByPDataId" resultMap="BaseResultMap">