|
|
@@ -1780,6 +1780,61 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
@Override
|
|
|
public List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid) {
|
|
|
List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id,ufid);
|
|
|
+ PublicRelease e = publicReleaseMapper.queryById(id);
|
|
|
+ List<PublicExamine> publicExamines = publicExamineMapper.selectByPrid(id);
|
|
|
+ if (e.getStatus()==1){
|
|
|
+ outPublicReleaseLog outPublicReleaseLog = new outPublicReleaseLog();
|
|
|
+ outPublicReleaseLog.setStatus(6);
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
|
|
|
+ if (e.getType()==3){
|
|
|
+ adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ if(str.length()>1){
|
|
|
+
|
|
|
+ outPublicReleaseLog.setAname(str.substring(0,str.length()-1));
|
|
|
+ list.add(outPublicReleaseLog);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
|
+ &&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
|
|
|
+ &&(e.getAssistProcess()==0||e.getAssistProcess()==1)
|
|
|
+ ){
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ if(str.length()>1){
|
|
|
+ outPublicReleaseLog.setAname(str.substring(0,str.length()-1));
|
|
|
+ list.add(outPublicReleaseLog);
|
|
|
+ }
|
|
|
+ }else if (e.getType()==0&&e.getAssistProcess()==2){
|
|
|
+ //获取技术协单
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (PublicRelease e2 : publicReleases) {
|
|
|
+ if (e2.getStatus()==1){
|
|
|
+ adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e2.getAid());
|
|
|
+ List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e1 -> e1.getType() == 1).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e1 : collect) {
|
|
|
+ str.append(e1.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(str.length()>1){
|
|
|
+ outPublicReleaseLog.setAname(str.substring(0,str.length()-1));
|
|
|
+ list.add(outPublicReleaseLog);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ String s = publicReleaseDetailsMapper.selectUserAdminByPrid(e.getId());
|
|
|
+ outPublicReleaseLog.setAname(s);
|
|
|
+ list.add(outPublicReleaseLog);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|