Przeglądaj źródła

特批审核列表修改

anderx 2 lat temu
rodzic
commit
f1aab282a6

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -91,7 +91,7 @@ public interface OrderProjectService {
 
 	int pushExamineMemberProject(InputMenber in);
 
-	void addMemberLog(Integer id,Integer status ,String remarks);
+	void addMemberLog(Integer id,Integer status ,String remarks,String aid);
 
 	List<MemberLogBo> memberLog(Integer id);
 

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

@@ -338,7 +338,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public int addMemberProject(InputAddTask t){
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 		addOrderTask(t);
-		orderProjectService.addMemberLog(t.getId(),0,"新增会员项目");
+		orderProjectService.addMemberLog(t.getId(),0,"新增会员项目",TokenManager.getAdminId());
 		orderProjectService.addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
 		return 1;
 	}

+ 12 - 6
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1309,6 +1309,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
 		String aid=TokenManager.getAdminId();
 		Integer status=1;
+		boolean appFlag=false;
 		//是否财务审核加复审
 		boolean flag=false;
 		TOrderTask nt=new TOrderTask();
@@ -1360,6 +1361,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						//部门设置无需特批的情况下直接完成,否则走正常流程
 						if (department.getApproval()==0){
 							nt.setProcessStatus(3);
+							//判定无特批直接完成新增日志
+							appFlag=true;
 						}else {
 							nt.setProcessStatus(2);
 						}
@@ -1376,7 +1379,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 				}
 				if(flag){
-
 					subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
 				}
 			}else if(in.getType()==1){
@@ -1396,7 +1398,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),2);
 			}
 		}
-		addMemberLog(in.getId(),status,in.getRemarks());
+		addMemberLog(in.getId(),status,in.getRemarks(),TokenManager.getAdminId());
 		if (nt.getProcessStatus()!=null&&nt.getProcessStatus()==3){
 			tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
 		}
@@ -1404,6 +1406,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (flag){
 			addNoticMember(notice, ono, in.getType(),result);
 		}
+		if(appFlag)addMemberLog(in.getId(),status,"未设置特批账号,跳过特批审核",null);
 		return 1;
 	}
 
@@ -1439,7 +1442,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public int updateMemberProject(InputAddTask t) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		if(task.getProcessStatus()!=4)throw  new BusinessException("审核状态错误,无法提交。");
-		addMemberLog(t.getId(),0,"修改重新发起");
+		addMemberLog(t.getId(),0,"修改重新发起",TokenManager.getAdminId());
 		t.setProcessStatus(1);
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0,task);
@@ -1452,12 +1455,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	@Override
-	public void addMemberLog(Integer id,Integer status ,String remarks){
+	public void addMemberLog(Integer id,Integer status ,String remarks,String aid){
 		MemberLog log = new MemberLog();
 		log.setPid(id);
 		log.setStatus(status);
 		log.setRemarks(remarks);
-		log.setAid(TokenManager.getAdminId());
+		log.setAid(aid);
 		memberLogMapper.insertSelective(log);
 	}
 
@@ -1517,7 +1520,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
 		//处理主项目本次派单年份
 		tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
-		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
+		addMemberLog(tOrderTask.getId(),0,"新增会员项目",TokenManager.getAdminId());
 		if(memberType!=null){
 			addMemberExamine(tOrderTask);
 			addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask,null,0);
@@ -1547,7 +1550,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 					examineType=2;
 				}
 			}
+
 			tOrderTask.setExamineType(examineType);
+		}else {
+			throw new BusinessException("部门未设置财务专员。");
 		}
 		tOrderTask.setId(t.getId());