minitiger %!s(int64=9) %!d(string=hai) anos
pai
achega
407a841410

+ 3 - 2
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckApplyController.java

@@ -102,7 +102,7 @@ public class CheckApplyController extends BaseController {
     	}
     	User user = getCurrentUser(request);
     	checkAppeal.setVerify_person(new Long(user.getId()));
-    	int check_status = Constants.STATUS_APPEAL_SUCCEED;
+    	int check_status = Constants.STATUS_APPLY_SUCCEED;
     	checkAppeal.setCheck_status(check_status);
     	checkApplyService.update(checkAppeal);
     	Task task = new Task();
@@ -126,7 +126,7 @@ public class CheckApplyController extends BaseController {
     	}
     	User user = getCurrentUser(request);
     	checkAppeal.setVerify_person(new Long(user.getId()));
-    	int check_status = Constants.STATUS_APPEAL_FAILED;
+    	int check_status = Constants.STATUS_APPLY_FAILED;
     	checkAppeal.setCheck_status(check_status);
     	checkApplyService.update(checkAppeal);
     	Task task = new Task();
@@ -174,6 +174,7 @@ public class CheckApplyController extends BaseController {
     		throw new BusinessException(20101);
     	}
     	CheckApply checkItemOne =  checkApplyService.getByTaskId(checkAppeal.getId()) ;
+    	checkItemOne.setApply_man_name(CacheUtil.getUserTurenameFromMap(checkItemOne.getApply_man()));
     	return super.returnSuccessResult(checkItemOne);
     }