Procházet zdrojové kódy

处理发起公出

anderx před 1 rokem
rodič
revize
6fe1bc02f7

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

@@ -142,7 +142,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 	/**
-	 * 外出申请列表.公出列表
+	 * 外出申请列表.公出列表,我的协单列表
 	 */
 	@RequestMapping(value = "/listPublicRelease", method = RequestMethod.GET)
 	public Result listPublicRelease(InputPublicReleaseList in){

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

@@ -3,6 +3,7 @@ package com.goafanti.weChat.service.impl;
 import cn.jiguang.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.business.bo.InputRestrictProject;
 import com.goafanti.common.bo.EmailBo;
@@ -82,6 +83,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private TTaskMemberMapper tTaskMemberMapper;
 	@Autowired
 	private OrderNewService orderNewService;
+	@Autowired
+	private AdminPublicReviewerMapper adminPublicReviewerMapper;
 
 	@Override
 	@Transactional
@@ -1041,11 +1044,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}
 			}
 			if (!flag2) {
+
 				PublicRelease np = new PublicRelease();
 				BeanUtils.copyProperties(use,np);
 				np.setAssist(2);
 				np.setAid(s);
-				np.setStatus(1);
+				List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(s);
+				if (!adminPublicReviewerBos.isEmpty()){
+					np.setStatus(1);
+				}else {
+					np.setStatus(2);
+				}
 				np.setType(3);
 				np.setMainId(use.getId());
 				np.setId(null);
@@ -1056,6 +1065,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
 				sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
 				publicReleaseLogMapper.insertSelective(log);
+				if (np.getStatus()==2){
+					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单无需审核自动通过", new Date());
+					publicReleaseLogMapper.insertSelective(log);
+				}
 			}
 		}
 	}