Browse Source

新增时间重复判定,一起协单,单独协单与非协单修改

anderx 1 year ago
parent
commit
f119c4521c
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

+ 3 - 2
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -992,8 +992,9 @@
     </select>
 
     <select id="checkTime" resultType="java.lang.Integer">
-        select id from public_release where aid=#{aid} and status in (0,1,2) and alone in (0,1)
-                                        and ( (release_start &gt;= #{start} and release_start &lt; #{end})
+        select id from public_release where aid=#{aid} and status in (0,1,2)
+        and (alone in (0,1) or (alone=2 and assist=2))
+        and ( (release_start &gt;= #{start} and release_start &lt; #{end})
                 or  (release_start &lt; #{start} and release_end &gt; #{start})
                 or  (release_start &lt; #{end} and release_end &gt; #{end}))
     </select>