--no commit message

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

@@ -21,7 +21,7 @@ import com.zrqx.core.vo.sysuser.bg.content.SignLanguageStatusVo;
 public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 	/** 分页查询*/
 	@Select("<script>" 
-			+ "SELECT distinct s.id,s.title,s.founder,s.founderId,s.distributor,s.complete,s.status,"
+			+ "SELECT distinct s.id,s.title,s.founder,s.founderId,s.distributor,s.complete,s.status,sl.status as status1"
 			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,sl.id as signUserId,"
 			+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime FROM sys_sign_language s "
 			+ "LEFT JOIN sys_sign_language_user_relation sl on sl.objectId=s.id where 1=1 "

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

@@ -97,6 +97,24 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 				if(signVo.getStatus()==null) {
 					signVo.setStatus(SignStatusEnum.NOT_STAY.getCode());
 				}
+				//获取任务状态
+				if(signVo.getStatus().equals(SignStatusEnum.YES_ADOPT.getCode())) {
+					Example example2 = userRelationService.createExample();
+					example2.createCriteria().andEqualTo("objectId", signVo.getId()).andEqualTo("role",3).andEqualTo("status", SignStatusEnum.NOT_REVIEW.getCode());
+					int num = userRelationService.selectCountByExample(example2);
+					if(num>0) {
+						signVo.setStatus(SignStatusEnum.NOT_REVIEW.getCode());
+						signVo.setCompleteTime(null);
+					}else {
+						example2 = userRelationService.createExample();
+						example2.createCriteria().andEqualTo("objectId", signVo.getId()).andEqualTo("role",3).andEqualTo("status", SignStatusEnum.YES_ADOPT.getCode());
+						num = userRelationService.selectCountByExample(example2);
+						if(num>0) {
+							signVo.setStatus(SignStatusEnum.YES_STAY.getCode());
+							signVo.setCompleteTime(null);
+						}
+					}
+				}
 				List<SignLanguageRelation> list2 = signLanguageRelationMapper.queryByType(userId,signVo.getId(),null);
 				if(list2.size()>0) {
 					signVo.setType(1);
@@ -121,14 +139,20 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 				//获取任务状态
 				if(li.getStatus().equals(SignStatusEnum.YES_ADOPT.getCode())) {
 					Example example2 = userRelationService.createExample();
-					example2.createCriteria().andEqualTo("objectId", li.getId()).andEqualTo("area_adminId",redis.getUser().getUserId()).andEqualTo("status", SignStatusEnum.NOT_REVIEW.getCode());
+					example2.createCriteria().andEqualTo("objectId", li.getId()).andEqualTo("area_adminId",redis.getUser().getArea_adminId()).andEqualTo("status", SignStatusEnum.NOT_REVIEW.getCode());
 					int num = userRelationService.selectCountByExample(example2);
 					if(num>0) {
 						li.setStatus(SignStatusEnum.NOT_REVIEW.getCode());
 						li.setCompleteTime(null);
-					}/*else {
-						li.setStatus(SignStatusEnum.YES_STAY.getCode());
-					}*/
+					}else {
+						example2 = userRelationService.createExample();
+						example2.createCriteria().andEqualTo("objectId", li.getId()).andEqualTo("area_adminId",redis.getUser().getArea_adminId()).andEqualTo("status", SignStatusEnum.YES_ADOPT.getCode());
+						num = userRelationService.selectCountByExample(example2);
+						if(num>0) {
+							li.setStatus(SignStatusEnum.YES_STAY.getCode());
+							li.setCompleteTime(null);
+						}
+					}
 				}
 				//获取任务状态
 				if(li.getStatus().equals(SignStatusEnum.YES_STAY.getCode())) {