Browse Source

新增二级审核

anderx 4 months ago
parent
commit
41df5ed893

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

@@ -676,7 +676,7 @@
 
     <select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
         select a.id ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,a.public_type publicType,a.order_no orderNo,
-        ton.contract_no contractNo,
+        ton.contract_no contractNo,a.process_status processStatus,
         date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
         date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
         a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
@@ -743,7 +743,8 @@
             and a.assist in(0,1)
             and a.tech_start_process in (0,2)
             and a.assist_process in (0,1,2,3,4)
-            and apr.reviewer_id = #{aid} and apr.type=0
+            and apr.reviewer_id = #{aid}
+            and ((apr.type=0 and a.process_status in (0,1)) or(apr.type=0 and a.process_status in (2)))
             <if test="status == 1">
                 and a.status = #{status} and  a.assist_process in (0,1)
             </if>

+ 9 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -43,6 +43,15 @@ public class OutPublicReleaseList {
 	private Integer publicAssistAdvice;
 	private Integer assistProcess;
 	private Integer alone;
+	private Integer processStatus;
+
+	public Integer getProcessStatus() {
+		return processStatus;
+	}
+
+	public void setProcessStatus(Integer processStatus) {
+		this.processStatus = processStatus;
+	}
 
 	public String getContractNo() {
 		return contractNo;

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

@@ -997,8 +997,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						){
 							StringBuffer str =new StringBuffer();
 							adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
-							for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
-								if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
+							if (e.getProcessStatus()==0||e.getProcessStatus()==1){
+								for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
+									if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
+								}
+							}else if (e.getProcessStatus()==2){
+								for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
+									if(ap.getType()==2)str=str.append(ap.getReviewerName()+",");
+								}
 							}
 							e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
 						}else if (e.getType()==0&&e.getAssistProcess()==2){
@@ -1143,25 +1149,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					long time;
                     if (collect.isEmpty()) {
                         time = 0;
-
                     } else {
 						time = collect.stream()
 								.mapToLong(e -> e.getCreateTime().getTime())
 								.max().orElse(0L);
 					}
 					//获取驳回或者撤销后的列表
-					Stream<outPublicReleaseLog> outPublicReleaseLogStream = outPublicReleaseLogs.stream().filter(e -> e.getCreateTime().getTime() > time);
-
-					outPublicReleaseLogStream.forEach(e -> {
-						outPublicReleaseLogs.stream().forEach(e1 -> {
-							if (e1.getAid().equals(e.getAid())) {
+					if(!outPublicReleaseLogs.isEmpty()){
+						List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream().filter(e -> e.getCreateTime().getTime() > time).collect(Collectors.toList());
+						if (!collect1.isEmpty()) {
+							Set<String> aidSet = collect1.stream()
+									.map(outPublicReleaseLog::getAid)
+									.collect(Collectors.toSet());
+
+							boolean hasMatchingAid = outPublicReleaseLogs.stream()
+									.map(outPublicReleaseLog::getAid)
+									.anyMatch(aidSet::contains);
+
+							if (hasMatchingAid) {
 								flag.set(1);
 							}
-						});
-					});
+						}
+					}
 					//有审核的情况下可以直接跳过
                     if (flag.get() == 1) {
-						p.setStatus(2);
 						p.setProcessStatus(3);
 						//如果是协单公出主公出,在审核通过
 						if (use.getAssist()==1){