bug

VisualInspection/js/new.js

@@ -419,7 +419,8 @@ function opennew(a, id) {
                 alert("权限不足");
             }
         } else if (a == 2) {
-            if (user.position_name.indexOf('清障队') === 0 || user.position_name.indexOf('稽查员') === 0 || user.position_name.indexOf('调度') === 0 || user.position_name.indexOf('内勤') === 0 || user.position_name.indexOf('队长') === 0) {
+            console.log(user.position_name);
+            if (user.position_name.indexOf('清障队') === 0 || user.position_name.indexOf('稽查员') === 0 || user.position_name.indexOf('调度') === 0 || user.position_name.indexOf('内勤') === 0 || user.position_name.indexOf('队长') === 0 ||user.position_name.indexOf('副队长') == 0) {
                 window.location.href = base_ui_url + furl[a] + "view/main.html?";
             } else {
                 alert("权限不足");

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/ConfirmTask.java

@@ -50,7 +50,7 @@ public class ConfirmTask {
 		FwqCheckTask task = new FwqCheckTask();
 		task.setCheck_status(Constants.STATUS_CHECK_DISPATCH);
 		Object unConfirmedTaskList = taskService.getAllTask(0, 0, task);
-		int taskConfirmDays = 4;
+		int taskConfirmDays = 3;
 		List<FwqCheckTask> list = (ArrayList<FwqCheckTask>) unConfirmedTaskList;
 		Map<String, Constant> codeMap = commonService.getCodeMap();
 		Date now = new Date();
@@ -58,7 +58,9 @@ public class ConfirmTask {
 		for (FwqCheckTask t : list) {
 			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
 			if (taskStatusList != null && taskStatusList.size() > 0) {
-				TaskStatus taskStatus = taskStatusList.get(0);
+				TaskStatus taskStatus = taskStatusList.get(taskStatusList.size()-1);
+				System.out.println(now.getTime());
+				System.out.println(now.getTime());
 				long days = (now.getTime() - taskStatus.getUpdate_time().getTime()) / (1000 * 60 * 60 * 24);
 				if (days >= taskConfirmDays) {
 					t.setCheck_status(Constants.STATUS_CHECK_CONFIRM);
@@ -85,7 +87,7 @@ public class ConfirmTask {
 		for(FwqCheckTask t:unConfirmedTaskList) {
 			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
 			if(taskStatusList!=null && taskStatusList.size()>0) {
-				TaskStatus taskStatus = taskStatusList.get(0);
+				TaskStatus taskStatus = taskStatusList.get(taskStatusList.size()-1);
 				long days = (now.getTime()-taskStatus.getUpdate_time().getTime())/(1000*60*60*24);
 				if(days>=taskConfirmDays){
 					t.setCheck_status(Constants.STATUS_APPEAL_CHECK_CONFIRMED);

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/ConfirmTask.java

@@ -51,7 +51,7 @@ public class ConfirmTask {
 		QzdCheckTask task = new QzdCheckTask();
 		task.setCheck_status(Constants.STATUS_CHECK_DISPATCH);
 		Object unConfirmedTaskList = taskService.getAllTask(0, 0, task);
-		int taskConfirmDays = 4;
+		int taskConfirmDays = 3;
 		List<QzdCheckTask> list = (ArrayList<QzdCheckTask>) unConfirmedTaskList;
 		Map<String, Constant> codeMap = commonService.getCodeMap();
 		Date now = new Date();
@@ -59,7 +59,7 @@ public class ConfirmTask {
 		for (QzdCheckTask t : list) {
 			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
 			if (taskStatusList != null && taskStatusList.size() > 0) {
-				TaskStatus taskStatus = taskStatusList.get(0);
+				TaskStatus taskStatus = taskStatusList.get(taskStatusList.size()-1);
 				long days = (now.getTime() - taskStatus.getUpdate_time().getTime()) / (1000 * 60 * 60 * 24);
 				if (days >= taskConfirmDays) {
 					t.setCheck_status(Constants.STATUS_CHECK_CONFIRM);
@@ -86,7 +86,7 @@ public class ConfirmTask {
 		for(QzdCheckTask t:unConfirmedTaskList) {
 			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
 			if(taskStatusList!=null && taskStatusList.size()>0) {
-				TaskStatus taskStatus = taskStatusList.get(0);
+				TaskStatus taskStatus = taskStatusList.get(taskStatusList.size()-1);
 				long days = (now.getTime()-taskStatus.getUpdate_time().getTime())/(1000*60*60*24);
 				if(days>=taskConfirmDays){
 					t.setCheck_status(Constants.STATUS_APPEAL_CHECK_CONFIRMED);