Browse Source

财务审核列表修改

anderx 2 years ago
parent
commit
fc0d128dbb

+ 15 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -512,6 +512,15 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//如果全部派单完成才需要通知和走下个流程
 		if (flag){
 			pushNoticeAndEmail(t, new1);
+		}else {
+			List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
+			StringBuffer str=new StringBuffer();
+			for (TOrderExamine e : tOrderExamines) {
+				if (e.getStatus()==0){
+					str=str.append(e.getAname());
+				}
+			}
+			t.setExamineName(str.substring(0,str.length()-1));
 		}
 
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
@@ -519,6 +528,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
 		List<String> aids = new ArrayList<>();
+		StringBuffer str= new StringBuffer();
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
@@ -529,6 +539,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			types.add(AFTConstants.CED_ASSISTANT);
 			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
 				aids.add(admin.getId());
+				str=str.append(admin.getName());
 			}
 		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
 				new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
@@ -539,6 +550,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
 			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
 				aids.add(admin.getId());
+				str=str.append(admin.getName());
 			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
@@ -548,9 +560,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			t.setFinanceId(oo.getFinanceId());
 			for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
 				aids.add(admin.getId());
+				str=str.append(admin.getName());
 			}
 		}
-
+		//用与外部修改名称
+		t.setExamineName(str.substring(0,str.length()-1));
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
 	}