Просмотр исходного кода

详情显示审核人员修改

anderx 1 год назад
Родитель
Сommit
fc3ea81bfc

+ 15 - 11
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -600,6 +600,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						((e.getPublicType()==0||e.getPublicType()==2)&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
 				){
 					e.setAdminExamine(e.getReviewerName()+" 未审核");
+				}else if (e.getStatus()==0) {
+					e.setAdminExamine("");
 				}else {
 					if (!publicExamines.isEmpty()){
 						StringBuffer str =new StringBuffer();
@@ -633,7 +635,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if (use.getStatus()!=1) {
 			throw new BusinessException("只能修改发起的状态公出");
 		}
-		if(examineType==0||examineType==1){
+		if((use.getTechStartProcess()==1||use.getTechStartProcess()==3)&&(examineType==0||examineType==1)){
 			if(use.getTechStartProcess()!=0) throw new BusinessException("技术公出先需营销审核。");
 
 		}
@@ -1161,20 +1163,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				((out.getPublicType()==0||out.getPublicType()==2)&&(out.getTechStartProcess()==0||out.getTechStartProcess()==2))
 		){
 			out.setAdminExamine(out.getReviewerName()+" 未审核");
+		}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 (!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 (str.length()>1) out.setAdminExamine(str.substring(0,str.length()-1));
-				}
 
+				}
 			}
-		}
 		out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
 		return out;
 	}