|
|
@@ -1445,7 +1445,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public OutPublicRelease details(Integer id) {
|
|
|
+ public OutPublicRelease dtails(Integer id) {
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
//如果不是本人和审核人员则不返回信息
|
|
|
OutPublicRelease out=publicReleaseMapper.selectDtails(id);
|
|
|
@@ -1473,7 +1473,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}else if(out.getType()==3){
|
|
|
- //如果是协单,如果是审核人则可以查看
|
|
|
+ //如果是协单,如果是审核人则可以查看
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
@@ -1536,19 +1536,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else if (out.getStatus()==0) {
|
|
|
out.setAdminExamine("");
|
|
|
}else {
|
|
|
- if (!ps.isEmpty()){
|
|
|
- StringBuffer str =new StringBuffer();
|
|
|
- for (PublicExamine e : ps) {
|
|
|
- if (out.getId().equals(e.getPrid())){
|
|
|
- str.append(e.getAname());
|
|
|
- if (e.getStatus()==0) str.append(" 未审核,");
|
|
|
- if (e.getStatus()==1) str.append(" 已审核,");
|
|
|
- }
|
|
|
- if (str.length()>1) out.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
+ if (!ps.isEmpty()){
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (PublicExamine e : ps) {
|
|
|
+ if (out.getId().equals(e.getPrid())){
|
|
|
+ str.append(e.getAname());
|
|
|
+ if (e.getStatus()==0) str.append(" 未审核,");
|
|
|
+ if (e.getStatus()==1) str.append(" 已审核,");
|
|
|
}
|
|
|
-
|
|
|
+ if (str.length()>1) out.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
+ }
|
|
|
List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
|
|
|
pushDateClockDetailsToday(prdList,prdcList);
|