修改teamwork

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/ThisApplication.java

@@ -35,8 +35,8 @@ public class ThisApplication {
 			context.schedule( Timertask_RefreshAllTaskReview.class, "0 0 2 * * ?" );
 			
 			//每30分钟核对一次所有的工作任务，判断工作任务是否已经超时
-			//context.schedule( Timertask_CheckAllTaskOverTime.class, "0 0/30 * * * ?" );
-			
+			//context.schedule( Timertask_CheckAllTaskOverTime.class, "0 0/30 * * * ?" ); 
+			context.schedule( Timertask_CheckAllTaskOverTime.class, "* 0/10 * * * ?" );
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionViewAllListNextWithFilter.java

@@ -294,7 +294,7 @@ public class ActionViewAllListNextWithFilter extends BaseAction {
 				}
 			}
 			if( StringUtils.isNotEmpty( this.getOvertime() )) {
-				if( "true".equalsIgnoreCase( this.getDeleted() )) {
+				if( "true".equalsIgnoreCase( this.getOvertime() )) {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", true ) );
 				}else {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", false ) );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionViewCompletedListNextWithFilter.java

@@ -64,7 +64,7 @@ public class ActionViewCompletedListNextWithFilter extends BaseAction {
 		if( Boolean.TRUE.equals( check ) ){
 			if( Boolean.TRUE.equals( check ) ){
 				wrapIn.setProject(projectId);
-				wrapIn.setCompleted("true");
+				wrapIn.setWorkStatus("completed");
 				queryFilter = wrapIn.getQueryFilter();
 			}
 		}
@@ -131,7 +131,6 @@ public class ActionViewCompletedListNextWithFilter extends BaseAction {
 		@FieldDescribe("工作等级：普通-normal | 紧急-urgent | 特急-extraurgent，单值，非必填")
 		private String priority = null;		
 		
-		@FieldDescribe("用于搜索的工作状态：草稿- draft  | 执行中- processing | 已完成- completed | 已归档- archived，单值，非必填")
 		private String workStatus = null;
 		
 		private String completed = null;		
@@ -294,7 +293,7 @@ public class ActionViewCompletedListNextWithFilter extends BaseAction {
 				}
 			}
 			if( StringUtils.isNotEmpty( this.getOvertime() )) {
-				if( "true".equalsIgnoreCase( this.getDeleted() )) {
+				if( "true".equalsIgnoreCase( this.getOvertime() )) {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", true ) );
 				}else {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", false ) );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionViewMyExecutListNextWithFilter.java

@@ -294,7 +294,7 @@ public class ActionViewMyExecutListNextWithFilter extends BaseAction {
 				}
 			}
 			if( StringUtils.isNotEmpty( this.getOvertime() )) {
-				if( "true".equalsIgnoreCase( this.getDeleted() )) {
+				if( "true".equalsIgnoreCase( this.getOvertime() )) {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", true ) );
 				}else {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", false ) );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionViewUncompletedListNextWithFilter.java

@@ -25,6 +25,7 @@ import com.x.teamwork.core.entity.tools.filter.QueryFilter;
 import com.x.teamwork.core.entity.tools.filter.term.EqualsTerm;
 import com.x.teamwork.core.entity.tools.filter.term.IsFalseTerm;
 import com.x.teamwork.core.entity.tools.filter.term.LikeTerm;
+import com.x.teamwork.core.entity.tools.filter.term.NotEqualsTerm;
 
 import net.sf.ehcache.Element;
 
@@ -64,7 +65,7 @@ public class ActionViewUncompletedListNextWithFilter extends BaseAction {
 		if( Boolean.TRUE.equals( check ) ){
 			if( Boolean.TRUE.equals( check ) ){
 				wrapIn.setProject(projectId);
-				wrapIn.setCompleted("false");
+				wrapIn.setWorkStatus("processing");
 				queryFilter = wrapIn.getQueryFilter();
 			}
 		}
@@ -131,7 +132,6 @@ public class ActionViewUncompletedListNextWithFilter extends BaseAction {
 		@FieldDescribe("工作等级：普通-normal | 紧急-urgent | 特急-extraurgent，单值，非必填")
 		private String priority = null;		
 		
-		@FieldDescribe("用于搜索的工作状态：草稿- draft  | 执行中- processing | 已完成- completed | 已归档- archived，单值，非必填")
 		private String workStatus = null;
 		
 		private String completed = null;		
@@ -280,7 +280,7 @@ public class ActionViewUncompletedListNextWithFilter extends BaseAction {
 				queryFilter.addEqualsTerm( new EqualsTerm( "executor", this.getExecutor() ) );
 			}
 			if( StringUtils.isNotEmpty( this.getCompleted() )) {
-				if( "true".equalsIgnoreCase( this.getCompleted() )) {
+				if( "true".equalsIgnoreCase( this.getCompleted() )) { 
 					queryFilter.addEqualsTerm( new EqualsTerm( "completed", true ) );
 				}else {
 					queryFilter.addEqualsTerm( new EqualsTerm( "completed", false ) );
@@ -294,7 +294,7 @@ public class ActionViewUncompletedListNextWithFilter extends BaseAction {
 				}
 			}
 			if( StringUtils.isNotEmpty( this.getOvertime() )) {
-				if( "true".equalsIgnoreCase( this.getDeleted() )) {
+				if( "true".equalsIgnoreCase( this.getOvertime() )) {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", true ) );
 				}else {
 					queryFilter.addEqualsTerm( new EqualsTerm( "overtime", false ) );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/timertask/Timertask_CheckAllTaskOverTime.java

@@ -65,6 +65,13 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
 												logger.error(e);
 											}																
 										}
+										if( task.getEndTime().after( now ) && task.getOvertime()) {
+											//超时变未超时,打上标识，不发送提醒
+											emc.beginTransaction( Task.class );
+											task.setOvertime( false );
+											emc.check( task, CheckPersistType.all );
+											emc.commit();														
+										}
 										
 										Date now_30 = DateUtils.addMinutes(task.getEndTime(), -30);
 										if( now_30.before( now ) && !task.getOvertime()) {