Преглед изворни кода

客户转交,订单转交修改公出转交审核人

anderx пре 2 година
родитељ
комит
ce4789c6b9
1 измењених фајлова са 22 додато и 22 уклоњено
  1. 22 22
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

+ 22 - 22
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1318,27 +1318,24 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		//先查出所有在其他审核的公出
 		List<PublicReleaseTransferUserBo> list=publicExamineMapper.selectByuList(uList);
 		Admin admin = adminMapper.selectByPrimaryKey(aid);
+		Integer logStatus=null;
+		String logMsg=null;
+		StringBuffer content=null;
+		String noticeAid=null;
 		for (PublicReleaseTransferUserBo e : list) {
 			PublicExamine pe=new PublicExamine();
 			pe.setPrid(e.getId());
 			if (e.getAid().equals(aid)){
+				content=new StringBuffer().append("[").append(e.getUserNames()).append("]公司的外出申请已发起,请尽快审核。");
 				//再查比对和发起者一致的全部走入下一个审核流程
-				PublicReleaseLog log = new PublicReleaseLog(e.getId(), TokenManager.getAdminId(), 2, "转交客户到发起公出审核人,自动审核通过。", new Date());
-				publicReleaseLogMapper.insertSelective(log);
 				PublicRelease pr=new PublicRelease();
 				pr.setId(e.getId());
 				pr.setPublicType(0);
 				publicReleaseMapper.updateByPrimaryKeySelective(pr);
 				Admin sendAdmin=adminMapper.selectByPrimaryKey(admin.getReviewer());
-				systemWebSocketHandler.sendMessageToUser(sendAdmin.getId(), new TextMessage("unread"));
-				StringBuffer content=new StringBuffer().append("[").append(e.getUserNames()).append("]公司的外出申请已发起,请尽快审核。");
-				Notice n =new Notice();
-				n.setId(UUID.randomUUID().toString());
-				n.setAid(sendAdmin.getId());
-				n.setNoticeType(NoticeStatus.PUBLIC_RELEASE_START.getCode());
-				n.setContent(content.toString());
-				n.setReaded(0);//未读
-				asyncUtils.addNotice(n);
+				noticeAid=sendAdmin.getId();
+				logStatus=2;
+				logMsg="转交客户到发起公出审核人,自动审核通过。";
 				pe.setAid(sendAdmin.getId());
 				pe.setAname(sendAdmin.getName());
 				pe.setCreateTime(new Date());
@@ -1347,18 +1344,21 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				pe.setAid(aid);
 				pe.setAname(admin.getName());
 				//给新的审核人发送消息
-				PublicReleaseLog log = new PublicReleaseLog(e.getId(), TokenManager.getAdminId(), 5, "转交客户归属人到["+admin.getName()+"]。", new Date());
-				publicReleaseLogMapper.insertSelective(log);
-				systemWebSocketHandler.sendMessageToUser(aid, new TextMessage("unread"));
-				StringBuffer content=new StringBuffer().append("[").append(e.getUserNames()).append("]公司已转交给您,相关公出请尽快审核。");
-				Notice n =new Notice();
-				n.setId(UUID.randomUUID().toString());
-				n.setAid(aid);
-				n.setNoticeType(NoticeStatus.PUBLIC_RELEASE_START.getCode());
-				n.setContent(content.toString());
-				n.setReaded(0);//未读
-				asyncUtils.addNotice(n);
+				logStatus=5;
+				logMsg="转交客户归属人到["+admin.getName()+"]。";
+				content=new StringBuffer().append("[").append(e.getUserNames()).append("]公司已转交给您,相关公出请尽快审核。");
+				noticeAid=aid;
 			}
+			PublicReleaseLog log = new PublicReleaseLog(e.getId(), TokenManager.getAdminId(), logStatus, logMsg, new Date());
+			publicReleaseLogMapper.insertSelective(log);
+			systemWebSocketHandler.sendMessageToUser(noticeAid, new TextMessage("unread"));
+			Notice n =new Notice();
+			n.setId(UUID.randomUUID().toString());
+			n.setAid(noticeAid);
+			n.setNoticeType(NoticeStatus.PUBLIC_RELEASE_START.getCode());
+			n.setContent(content.toString());
+			n.setReaded(0);//未读
+			asyncUtils.addNotice(n);
 			publicExamineMapper.updateByPridSelective(pe);
 		}
 	}