--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/resource/ResourceLibraryController.java

@@ -403,7 +403,7 @@ public class ResourceLibraryController {
 							sign.setCompleteTime(null);
 							sign.setStatus(SignStatusEnum.NOT_REVIEW.getCode());
 							signLanguageService.updateByPrimaryKeySelective(sign);
-							/*return;*/
+							break;
 						}
 					}
 					// 所有用户都提交了视频，且通过
@@ -594,14 +594,14 @@ public class ResourceLibraryController {
 					userRelation.setStatus_1(SignStatusEnum.YES_ADOPT.getCode());
 					signLanguageUserRelationService.updateByPrimaryKeySelective(userRelation);
 					
-					  example = service.createExample();
+/*					  example = service.createExample();
 					  example.createCriteria().andEqualTo("signLanguageId", vi.getSignLanguageId())
 					  .andEqualTo("userId", vi.getUserId()).andEqualTo("status",
 					  LibraryStatusEnum.STATUS_0.getCode()); int num11 =
 					  service.selectCountByExample(example); if (num11 > 0) {
 					  
 					  }else { userRelation.setStatus_1(SignStatusEnum.NOT_REVIEW.getCode());
-					  signLanguageUserRelationService.updateByPrimaryKeySelective(userRelation); }
+					  signLanguageUserRelationService.updateByPrimaryKeySelective(userRelation); }*/
 					 
 				} else {
 					userRelation.setStatus_1(SignStatusEnum.YES_STAY.getCode());

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java

@@ -132,11 +132,11 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 			+ "</script>")
 	List<SignLanguageStatusVo> pageSelect(@Param("id")String id);
 	@Select("<script>" 
-			+ "SELECT count(*) FROM sys_sign_language_user_relation where 1=1  "
+			+ "SELECT count(*) FROM sys_sign_language_relation where 1=1  "
 			+ "<if test='"+ NOTBLANK +"(id)'>"
     		+ " and objectId = #{id} "
     		+ "</if>"
-    		+ " and role=2"
+    		+ " and status=4"
 			+ "</script>")
 	Integer queryBycompleteNum(@Param("id")String id);
 

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java

@@ -420,7 +420,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 		vo.setDistributeNum(distributeNum);
 		//已完成区域
 		Integer completeNum = mapper.queryBycompleteNum(form.getId());
-		vo.setDistributeNum(completeNum);
+		vo.setCompleteNum(completeNum);
 		//查询当前区域
 		 List<SignLanguageStatusVo> list = mapper.pageSelect(form.getId());
 		 for (SignLanguageStatusVo statusVo : list) {

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/resource/FgResourceLibraryController.java

@@ -485,7 +485,7 @@ public class FgResourceLibraryController {
 									sign.setCompleteTime(null);
 									sign.setStatus(SignStatusEnum.NOT_REVIEW.getCode());
 									signLanguageService.updateByPrimaryKeySelective(sign);
-									return ;
+									break;
 								}
 							}
 							// 所有用户都提交了视频，且通过

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/content/FgSignLanguageServiceImpl.java

@@ -857,12 +857,18 @@ public class FgSignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Str
 			video3.setArea_adminId(user.getUserId());
 			int status_2 = videoLibraryMapper.selectCount(video3);
 			fgVo.setStatus_2(status_2+status_3);
-			//审核中
+			//区域管理员审核中
 			VideoLibrary video23 = new VideoLibrary();
 			video23.setSignLanguageId(form.getId());
 			video23.setStatus(LibraryStatusEnum.STATUS_0.getCode());
 			video23.setArea_adminId(user.getUserId());
 			int status_7 = videoLibraryMapper.selectCount(video23);
+			//中心管理审核中
+			video23 = new VideoLibrary();
+			video23.setSignLanguageId(form.getId());
+			video23.setStatus_1(LibraryStatusEnum.STATUS_0.getCode());
+			video23.setArea_adminId(user.getUserId());
+			status_7 = videoLibraryMapper.selectCount(video23);
 			if (status_7>0) {
 				fgVo.setStatus(LibraryStatusEnum.STATUS_0.getCode());
 				fgVo.setStatus_zh(LibraryStatusEnum.getName(fgVo.getStatus()));