Przeglądaj źródła

发起判定修改为多审核判定
我的列表显示上级审核修改为多人

anderx 1 rok temu
rodzic
commit
351d63c111

+ 7 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1414,6 +1414,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		List<PublicExamine> ps = publicExamineMapper.selectByPrid(out.getId());
 		out.setPeList(ps);
 
+		List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
 		if(out!=null){
 			//默认可以看
 			boolean flag=false;
@@ -1424,7 +1425,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 				flag=true;
 			}
-			List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
 			if (out.getType()==0||out.getType()==1||out.getType()==2){
 				if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
 				List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
@@ -1480,7 +1480,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if (out.getStatus()==1&&
 				((out.getPublicType()==0||out.getPublicType()==2)&&(out.getTechStartProcess()==0||out.getTechStartProcess()==2))
 		){
-			out.setAdminExamine(out.getReviewerName()+" 未审核");
+			if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
+			StringBuffer str =new StringBuffer();
+			for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
+				str.append(e.getReviewerName()+",");
+			}
+			out.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
 		}else if (out.getStatus()==0) {
 			out.setAdminExamine("");
 		}else {