修改收费站站长角色获取任务列表问题

VisualInspection/js/lib/imageupload/js/imgUp.js

@@ -1,7 +1,7 @@
 $(function() {
     var delParent;
     var defaults = {
-        fileType: ["jpg", "png", "bmp", "jpeg"], // 上传文件的类型
+        fileType: ["jpg", "png", "bmp", "jpeg","JPG", "PNG", "BMP", "JPEG"], // 上传文件的类型
         fileSize: 1024 * 1024 * 10 // 上传文件的大小 10M
     };
     /*点击图片的文本框*/

VisualInspection/view/mytask/check.html

@@ -188,6 +188,7 @@
         }else{
             $("li.tab_lane").show();
             $("li.tab_not_lane").hide();
+            $("li.tab_lane:first").addClass("active");
         }
         initCheck();
 
@@ -203,7 +204,6 @@
                 showVideo = videos[i];
             }
 
-            alert(showVideo);
             if (showVideo != "" && showVideo && showVideo != "undefined") {
                 curVideo = showVideo;
                 queryVideoList();

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckAppealController.java

@@ -140,7 +140,9 @@ public class CheckAppealController extends BaseController {
     	PageHelper.startPage(page, size); 
     	User user = getCurrentUser(request);
     	if(AuthorUtil.hasRole(user, Constants.ROLE_STATION_ADMIN)
-    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION)){
+    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION)
+    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION_AGENT)
+    			||AuthorUtil.containsRole(user, "ROLE_STATION")){
     		task.setChecked_dept((long)user.getOrganid());
     	}else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
     		task.setRecheckman(new Long(user.getId()));

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckItemController.java

@@ -84,6 +84,12 @@ public class CheckItemController extends BaseController {
     	return super.returnSuccessResult(checkItems);
     }
     
+    @RequestMapping(value = "/getForTaskById")
+    public String getForTaskById(@RequestBody CheckItem checkItem){
+    	List<CheckItem> checkItems =  checkItemService.getAll();
+    	return super.returnSuccessResult(checkItems);
+    }
+    
     /**
      * 通过父亲id获取考核项
      * @return

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TaskController.java

@@ -188,7 +188,9 @@ public class TaskController extends BaseController {
     	PageHelper.startPage(page, size); 
     	User user = getCurrentUser(request);
     	if(AuthorUtil.hasRole(user, Constants.ROLE_STATION_ADMIN)
-    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION)){
+    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION)
+    			||AuthorUtil.hasRole(user, Constants.ROLE_STATION_AGENT)
+    			||AuthorUtil.containsRole(user, "ROLE_STATION")){
     		task.setChecked_dept((long)user.getOrganid());
     	}else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
     		task.setCheckman(new Long(user.getId()));

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/TaskServiceImpl.java

@@ -55,14 +55,14 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 		}
 		for(Task t : taskList) {
 			if(t.getCheckman() != null){
-				t.setCheckman_name(((User)CacheUtil.userMap.get(t.getCheckman())).getTruename());
+				t.setCheckman_name(CacheUtil.getUserTurenameFromMap(t.getCheckman()));
 			}
 			if(t.getChecked_person() != null){
-				t.setChecked_person_name(((User)CacheUtil.userMap.get(t.getChecked_person())).getTruename());
+				t.setChecked_person_name(CacheUtil.getUserTurenameFromMap(t.getChecked_person()));
 			}
 			if(t.getChecked_dept() != null){
 				if(CacheUtil.deptMap.get(t.getChecked_dept())!=null){
-					t.setChecked_dept_name(((Organ)CacheUtil.deptMap.get(t.getChecked_dept())).getOrganname());
+					t.setChecked_dept_name(CacheUtil.getOrgannameFromMap(t.getChecked_dept()));
 				}
 			}
 			t.setRecheckman_name(CacheUtil.getUserTurenameFromMap(t.getRecheckman()));

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/AuthorUtil.java

@@ -13,4 +13,13 @@ public class AuthorUtil {
 		}
 		return false;
 	}
+	
+	public static boolean containsRole(User user, String role) {
+		for(Role r:user.getRoles()) {
+			if(r.getName().contains(role)){
+				return true;
+			}
+		}
+		return false;
+	}
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/Constants.java

@@ -17,6 +17,7 @@ public class Constants {
 	
 	public static String ROLE_JICHA_ADMIN="ROLE_JICHA_ADMIN";
 	public static String ROLE_STATION_ADMIN="ROLE_STATION_ADMIN";
+	public static String ROLE_STATION_AGENT="ROLE_STATION_AGENT";
 	public static String ROLE_STATION="ROLE_STATION";
 	public static String ROLE_JICHA="ROLE_JICHA";
 	public static String ROLE_MANAGER="ROLE_MANAGER";