Merge branch 'master' into developer

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

@@ -149,6 +149,6 @@ public interface PreDealLogMapper {
      * @param taskId
      * @return
      */
-    public int countByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId);
+    public int countByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId,@Param("dataType") int dataType);
 
 }
\ No newline at end of file

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

@@ -111,7 +111,7 @@ public class PreDealServiceImpl implements PreDealService {
 
     @Override
     public boolean existDataId(String taskId, String dataId) {
-        int i = preDealLogMapper.countByDataId(taskId, dataId);
+        int i = preDealLogMapper.countByDataId(taskId, dataId,PreDealTypeEnum.clerk.getVal());
         return i > 0;
     }
 }

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

@@ -308,5 +308,8 @@
         from tab_haoban_pre_deal_log
         where task_id = #{taskId}
         and data_id =#{dataId}
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
     </select>
 </mapper>
\ No newline at end of file