Explorar el Código

我的详情审核人也由单人切换为多人

anderx hace 1 año
padre
commit
c76cf3ed74

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

@@ -394,7 +394,7 @@
             left join t_order_new ton on a.order_no =ton.order_no
             left join t_order_mid tom on a.order_no=tom.order_no
         </if>
-        <if test="type==6">
+        <if test="type==1 or type==6">
             left join admin_public_reviewer apr on a.aid=apr.aid
         </if>
         where 1=1
@@ -435,7 +435,7 @@
             and a.public_type in (0,2)
             and a.assist in(0,1)
             and a.tech_start_process in (0,2)
-            and c.reviewer = #{aid}
+            and apr.reviewer_id = #{aid}
         </if>
         <if test="type==2">
             and a.public_type in (0,2)

+ 1 - 1
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -130,7 +130,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 		return res;
 	}
 	/**
-	 * 外出申请详情
+	 * 外出申请详情、公出详情
 	 */
 	@RequestMapping(value = "/dtails", method = RequestMethod.GET)
 	public Result dtails(Integer id){

+ 14 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -714,7 +714,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
 							if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
 						}
-						e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
+
+						if(str.length()>1)e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
 					}else {
 						if (((e.getPublicType()==0||e.getPublicType()==2)
 								&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
@@ -1476,14 +1477,23 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}
 			}
 		}
-
+		//如果审核中
 		if (out.getStatus()==1&&
 				((out.getPublicType()==0||out.getPublicType()==2)&&(out.getTechStartProcess()==0||out.getTechStartProcess()==2)))
 		{
+
 			if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
 			StringBuffer str =new StringBuffer();
-			for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
-				str.append(e.getReviewerName()+",");
+			if(out.getType()==3){
+				List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
+				for (AdminPublicReviewerBo e : collect) {
+					str.append(e.getReviewerName()+",");
+				}
+			}else {
+				List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
+				for (AdminPublicReviewerBo e : collect) {
+					str.append(e.getReviewerName()+",");
+				}
 			}
 			out.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
 		}else if (out.getStatus()==0) {