Browse Source

非公出协单开发

anderx 16 hours ago
parent
commit
5b94bee0c1

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

@@ -802,9 +802,11 @@
             <if test="status==2">and a.tech_start_process in (2) </if>
         </if>
         <if test="type==6">
-            and a.type=0 and a.assist=1
+            and a.type in (0,5)
+            and a.assist=1
             and a.id in (select pr.main_id from public_release pr left join admin_public_reviewer apr
-            on pr.aid = apr.aid where  pr.`type` =3 and apr.type = 1 and apr.reviewer_id = #{aid})
+            on pr.aid = apr.aid where  pr.`type` in (3,6)
+            and apr.type = 1 and apr.reviewer_id = #{aid})
         </if>
         <if test="type==7">
             and opc.max_process in (1,2,3,4,5)

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

@@ -220,7 +220,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 	/**
-	 * 公出审核、外出审核 上级
+	 * 公出审核、外出审核 上级,二级审核
 	 */
 	@RequestMapping(value = "/examinePublicRelease", method = RequestMethod.POST)
 	public Result examinePublicRelease(Integer id ,Integer status,String remarks,Integer evaluateType){

+ 1 - 3
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1223,7 +1223,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
 					if (adminPublicReviewerBos.isEmpty()){
 						p.setStatus(2);
-						p.setProcessStatus(3);
 						//如果是协单公出主公出,在审核通过
 						if (use.getAssist()==1){
 							pushPublicReleaseAssist(use, p, date, a);
@@ -1928,7 +1927,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param date
 	 */
 	private void updatePushassist(PublicRelease use, PublicRelease updatePR, Date date, Admin a) {
-
 		//协单
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
 		String []ss= use.getAssistAid().split(",");
@@ -1998,7 +1996,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}
 		//判定是审核还是完成,取决于协单是否通过
-		List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),3,null);
+		List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),null,null);
 		int count = 0;
 		for (PublicRelease e : newList) {
 			//如果是完成或者拒绝则标记,全中断则修改状态