Explorar el Código

选择公示限制

Administrator hace 4 años
padre
commit
79e9089db8

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -319,7 +319,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			e.printStackTrace();
 			throw new BusinessException("转换异常");
 		}
-		int i=publicReleaseMapper.checkTime(in.getReleaseStart(),in.getReleaseEnd());
+		int i=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
 		if (i>0) {
 			return true;
 		}

+ 1 - 1
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -54,6 +54,6 @@ public interface PublicReleaseMapper {
 
 	OutPublicRelease selectDtails(@Param("id") Integer id,@Param("ufid")String ufid);
 
-	int checkTime(@Param("start")Date start, @Param("end")Date end);
+	int checkTime(@Param("aid")String aid,@Param("start")Date start, @Param("end")Date end);
 
 }

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

@@ -614,9 +614,10 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   </select>
   
   <select id="checkTime" resultType="java.lang.Integer">
-  select count(*) from public_release where (release_start &gt;= #{start} and release_start &lt; #{end})
+ select count(*) from public_release where aid=#{aid} and status in (0,1,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})
+  or  (release_start &lt; #{end} and release_end &gt; #{end}))
   </select>
   
 </mapper>