java/zhihuishenqu.git

			@@ -23,7 +23,7 @@
			</component>
			<component name="ChangeListManager">
			<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
			<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -405,7 +405,7 @@
			<workItem from="1610956684718" duration="7037000" />
			<workItem from="1611019208339" duration="94460000" />
			<workItem from="1611365644515" duration="33195000" />
			<workItem from="1611536010905" duration="3401000" />
			<workItem from="1611536010905" duration="4315000" />
			</task>
			<servers />
			</component>
			@@ -533,10 +533,10 @@
			<screen x="0" y="0" width="1536" height="824" />
			</state>
			<state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" />
			<state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611537080685">
			<state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611542348463">
			<screen x="0" y="0" width="1536" height="824" />
			</state>
			<state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611537080685" />
			<state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611542348463" />
			<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
			<screen x="0" y="0" width="1536" height="824" />
			</state>

			@@ -139,7 +139,7 @@
			@Update("update com_act_activity set `status`=3 where `status`=2 and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_begin)<=0")
			int updateStatusToBeginSign();

			@Update("update com_act_activity set `status`=(if(DATEDIFF(SYSDATE(),end_at)>=0,5,4)) where `status`=3 and TIMESTAMPDIFF(MINUTE,SYSDATE(),begin_at)<=0")
			@Update("update com_act_activity set `status`=(if(DATEDIFF(SYSDATE(),end_at)>=0,5,4)) where `status`=3 and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_end)<=0")
			int updateStatusToBeginActiveOrEnd();
			@Select("<script> " +
			"select t.* from (\n" +

			@@ -138,7 +138,7 @@
			@Update("update com_pb_activity set status=3 where `status`=2 and TIMESTAMPDIFF(MINUTE,SYSDATE(),enroll_time_begin)<=0")
			int updateStatusToSign();

			@Update("update com_pb_activity set status=(if(TIMESTAMPDIFF(MINUTE,SYSDATE(),activity_time_end)<=0,5,4)) where `status`=3 and TIMESTAMPDIFF(HOUR,SYSDATE(),activity_time_begin)<=0")
			@Update("update com_pb_activity set status=(if(TIMESTAMPDIFF(MINUTE,SYSDATE(),activity_time_end)<=0,5,4)) where `status`=3 and TIMESTAMPDIFF(MINUTE,SYSDATE(),enroll_time_end)<=0")
			int updateStatusToActiveOrEnd();
			@Select("select type,name from sys_user where user_id=#{createBy}")
			LoginUserInfoVO selectUserInfoByUserId(Long createBy);

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史