Procházet zdrojové kódy

详情显示审核人员修改

anderx před 1 rokem
rodič
revize
a719d6c84a

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -488,8 +488,8 @@
         a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,a.tech_start_process techStartProcess,
         a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
         date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,
-        a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids,a.public_type publicType
-        from public_release a  left join admin c on a.aid =c.id
+        a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids,a.public_type publicType,c2.name reviewerName
+        from public_release a  left join admin c on a.aid =c.id  left join admin c2 on c.reviewer =c2.id
         left join (select prid ,GROUP_CONCAT(uid)uids from public_release_details where prid= #{id} group by prid)x on a.id=x.prid
         left join t_order_new d on a.order_no=d.order_no
         where 1=1

+ 18 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

@@ -39,9 +39,27 @@ public class OutPublicRelease extends PublicRelease {
 	 */
 	private String assistAidName;
 	private String uids;
+	private String adminExamine;
+	private String reviewerName;
 	private List<OutPublicReleaseDetails> prdList;
 	private List<PublicExamine> peList;
 
+	public String getReviewerName() {
+		return reviewerName;
+	}
+
+	public void setReviewerName(String reviewerName) {
+		this.reviewerName = reviewerName;
+	}
+
+	public String getAdminExamine() {
+		return adminExamine;
+	}
+
+	public void setAdminExamine(String adminExamine) {
+		this.adminExamine = adminExamine;
+	}
+
 	public List<PublicExamine> getPeList() {
 		return peList;
 	}

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

@@ -597,22 +597,24 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
 			for (OutPublicReleaseList e : list) {
 				if (e.getStatus()==1&&
-						((e.getPublicType()==0||e.getPublicType()==2)||(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
+						((e.getPublicType()==0||e.getPublicType()==2)&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
 				){
 					e.setAdminExamine(e.getReviewerName()+" 未审核");
-				}
-				if (!publicExamines.isEmpty()){
-					StringBuffer str =new StringBuffer();
-					for (PublicExamine pe : publicExamines) {
-						if (e.getId().equals(pe.getPrid())){
-							str=str.append(pe.getAname());
-							if (pe.getStatus()==0)str=str.append(" 未审核,");
-							if (pe.getStatus()==1)str=str.append(" 已审核,");
+				}else {
+					if (!publicExamines.isEmpty()){
+						StringBuffer str =new StringBuffer();
+						for (PublicExamine pe : publicExamines) {
+							if (e.getId().equals(pe.getPrid())){
+								str=str.append(pe.getAname());
+								if (pe.getStatus()==0)str=str.append(" 未审核,");
+								if (pe.getStatus()==1)str=str.append(" 已审核,");
+							}
+							if (str.length()>1) e.setAdminExamine(str.substring(0,str.length()-1));
 						}
-						if (str.length()>1) e.setAdminExamine(str.substring(0,str.length()-1));
-					}
 
+					}
 				}
+
 			}
 		}
 
@@ -1154,6 +1156,25 @@ 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()+" 未审核");
+		}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));
+				}
+
+			}
+		}
 		out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
 		return out;
 	}