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

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

@@ -201,7 +201,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 	/**
-	 * 公出审核、外出审核 营销
+	 * 公出审核、外出审核 客户归属人
 	 */
 	@RequestMapping(value = "/marketersExamine", method = RequestMethod.POST)
 	public Result marketersExamine(Integer id ,Integer status,String remarks){
@@ -246,6 +246,13 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 
+	/**
+	 * 技术公出审核 公出他人企业
+	 * @param id
+	 * @param status
+	 * @param remarks
+	 * @return
+	 */
 	@RequestMapping(value = "/techExamine", method = RequestMethod.POST)
 	public Result techExamine(Integer id ,Integer status,String remarks){
 		Result res =new Result();

+ 1 - 8
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -12,14 +12,7 @@ public interface PublicReleaseService {
 	Object listPublicRelease(InputPublicReleaseList in);
 
 
-	/**
-	 *
-	 * @param id
-	 * @param status 状态 0驳回 1发起 2同意 3 撤销 4技术驳回
-	 * @param remarks
-	 * @param type 0上级审核 1营销员审核
-	 * @return
-	 */
+
 	int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer type);
 
 

+ 49 - 8
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -782,6 +782,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	}
 
+	/**
+	 *
+	 * @param id
+	 * @param status 状态 0驳回 1发起 2同意 3 撤销 4技术驳回
+	 * @param remarks
+	 * @param examineType 0上级审核 1营销员审核 2技术审核
+	 * @return
+	 */
 	@Override
 	@Transactional
 	public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer examineType) {
@@ -830,7 +838,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				addpublicLog(id, status, remarks);
 				//如果是协单公出主公出,在审核通过
 				if (use.getAssist()==1){
-					pushPublicReleaseAssist(use,status,date,a);
+					int newStatus = pushPublicReleaseAssist(use, status, date, a);
+					p.setStatus(newStatus);
 				}else if (use.getAssist()==0){
 					publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
 				}
@@ -846,7 +855,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}else if (examineType==1){
 			//通知公出人切换成公出人审核人
 			a=adminMapper.selectByPrimaryKey(a.getReviewer());
-			if (status==2){//审核通过
+			if (status==2){
+				//审核通过
 				str=str.append("同意公出我的企业,").append(remarks);
 				content=content.append("已通过审核,请尽快审核。");
 				List<PublicExamine> publicExamines = publicExamineMapper.selectByPrid(use.getId());
@@ -870,7 +880,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					flag=true;
 				}
 				addpublicLog(id, status, str.toString());
-
 			}else if (status==0){//审核驳回
 				//切换通知人公出负责人
 				a=publicAdmin;
@@ -911,7 +920,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}
 				addpublicLog(id, status, str.toString());
 
-			}else if (status==0){//审核驳回
+			}else if (status==0){
+				//审核驳回
 				//切换通知人公出负责人
 				a=publicAdmin;
 				str=str.append("不同意公出我的企业,").append(remarks);;
@@ -973,6 +983,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			newPublic.setStatus(status);
 		}
 		publicReleaseMapper.update(newPublic);
+		//审核需看是否所有人审核
+		List<PublicRelease> newList = publicReleaseMapper.selectByMainId(mianUse.getId(),3,null);
+		int count = 0;
+		for (PublicRelease e : newList) {
+			if (e.getStatus()==2){
+				count++;
+			}
+		}
+		if(count==newList.size()){
+			PublicRelease newPublic2=new PublicRelease();
+			newPublic2.setId(mianUse.getId());
+			newPublic2.setStatus(2);
+			publicReleaseMapper.update(newPublic2);
+		}
 		sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
 		return 1;
 	}
@@ -1134,14 +1158,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param date 时间
 	 * @param a
 	 */
-	private void pushPublicReleaseAssist(PublicRelease use,Integer status,Date date,Admin a) {
+	private int pushPublicReleaseAssist(PublicRelease use,Integer status,Date date,Admin a) {
+		int newStatus=0;
 		if (use.getAssistAid()!=null){
-			updatePushassist(use, status, date,a);
+			newStatus=updatePushassist(use, status, date,a);
 			if(use.getAssistantAid()!=null){
 				updatepushAssistant(use,a);
 			}
 
 		}
+		return newStatus;
 	}
 
 	/**
@@ -1150,7 +1176,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	 * @param status
 	 * @param date
 	 */
-	private void updatePushassist(PublicRelease use, Integer status, Date date, Admin a) {
+	private Integer updatePushassist(PublicRelease use, Integer status, Date date, Admin a) {
+		//营销协单公出需要协单审核完成才能公出所以需返回最新状态
+		int newStatus = status;
 		//协单
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
 		String []ss= use.getAssistAid().split(",");
@@ -1205,7 +1233,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}
 			}
 			if (!flag2) {
-
 				PublicRelease np = new PublicRelease();
 				BeanUtils.copyProperties(use,np);
 				np.setAssist(2);
@@ -1232,6 +1259,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 			}
 		}
+		//判定是审核还是完成,取决于协单是否通过
+		List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),3,null);
+		int count = 0;
+		for (PublicRelease e : newList) {
+			if (e.getStatus()==2){
+				count++;
+			}
+		}
+		if(count==newList.size()){
+			newStatus = 2;
+		}else {
+			newStatus = 1;
+		}
+		return newStatus;
 	}
 
 	/**