Explorar el Código

发起判定修改为多审核判定
我的列表显示上级审核修改为多人

anderx hace 1 año
padre
commit
0a0c419f96

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

@@ -61,6 +61,11 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"协单人员"));
 			return res;
 		}
+		if (publicReleaseService.checkPublicReviewer(in)){
+			res.getError().add(buildError("请让管理员先设置公出审核人。"));
+			return res;
+		}
+
 		res.setData(publicReleaseService.addPublicRelease(in));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -79,4 +79,6 @@ public interface PublicReleaseService {
 	Object updateAssistExamine(Integer id, Integer status, String remarks);
 
 	Object assistUnaudited();
+
+    boolean checkPublicReviewer(InputPublicRelease in);
 }

+ 26 - 10
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -249,11 +249,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			Map<String, Object>map=new HashMap<String, Object>();
 			//无需订单负责人审核
 		if (in.getTechStartProcess()==0){
-			//获取公出审核人
-			if (my.getReviewer()==null){
-				throw new BusinessException("请让管理员设置公出审核人。");
-			}
-			Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
+//			Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
+			//订单审核换成多人
+			List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(in.getAid());
 			String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
 			//默认上级审核
 			AtomicReference<Integer> status= new AtomicReference<>(1);
@@ -301,7 +299,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				});
 			}
 			if (status.get()==1){
-				pushNoticeAndSoucketAndEmail(my, in, date, a, str, map);
+				for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
+					Admin admin = adminMapper.selectByPrimaryKey(adminPublicReviewerBo.getReviewerId());
+					pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
+				}
+
 			}
 			publicReleaseMapper.updateByPrimaryKeySelective(in);
 		}else {
@@ -706,17 +708,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
 			for (OutPublicReleaseList e : list) {
 				if (e.getStatus()==1){
+					List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
 					if (e.getType()==3){
-						List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
 						StringBuffer str =new StringBuffer();
 						for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
-							if(ap.getType()==1)str=str.append(ap.getReviewerName()+" 未审核,");
+							if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
 						}
-						e.setAdminExamine(str.substring(0,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))){
-							e.setAdminExamine(e.getReviewerName()+" 未审核");
+							StringBuffer str =new StringBuffer();
+							for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
+								if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
+							}
+							e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
+
 						}else {
 							e.setAdminExamine(e.getUserAdminName()+" 未审核");
 						}
@@ -958,6 +965,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return i;
 	}
 
+	@Override
+	public boolean checkPublicReviewer(InputPublicRelease in) {
+		List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(TokenManager.getAdminId());
+		if (adminPublicReviewerBos.isEmpty()){
+			return true;
+		}
+		return false;
+	}
+
 	private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
 		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
 		String endTime=startTime+" 23:59:59";