Browse Source

消息提醒BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
011c0ce86f

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -915,7 +915,7 @@
   
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,
+  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,
     a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
     ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 

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

@@ -286,14 +286,21 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			break;
 		case 7:
-			
-			for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
-				alist.add(admin.getId());
+			if(nb.getStatus()==2) {
+				alist.add(organizationManagementMapper.selectByPrimaryKey(o.getOrderDep()).getFinanceId());
+			}else {
+				for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
+					alist.add(admin.getId());
+				}
 			}
 			break;
 		case 8:
-			for (Admin admin : adminMapper.getAdminRoleList("运营决策者")) {
-				alist.add(admin.getId());
+			if(nb.getStatus()==2) {
+				alist.add(organizationManagementMapper.selectByPrimaryKey(o.getOrderDep()).getFinanceId());
+			}else {
+				for (Admin admin : adminMapper.getAdminRoleList("运营决策者")) {
+					alist.add(admin.getId());
+				}
 			}
 			break;
 		case 9:
@@ -412,7 +419,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setCwCost(t.getCwCost());
 			noc.setRefundableAmount(t.getRefundableAmount());
 		}
-		t.setProcessState(1);//流程置为营销管理员
 		if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
 		return 1; 
 	}

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

@@ -478,7 +478,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					}
 					
 				}
-				aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 			}else {
 				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 				for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
@@ -492,8 +491,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 				addBackOrder(orderNo, reason);
 				addOrderLog(orderNo, OrderLogProcess.BH.getCode());
-			
-				}else if (outsource==1) {}
+			}
 				aids.add(t2.getSalesmanId());
 				type=NoticeStatus.ORDER_NO.getCode();
 		}
@@ -946,7 +944,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			n.setAid(string);
 			nlist.add(n);
 			Admin admin = adminMapper.selectAllByid(string);
-			if(admin!=null&&admin.getEmail()!=null)adminIds+=admin.getEmail()+",";
+			if(admin!=null&&StringUtils.isNotBlank(admin.getEmail()))adminIds+=admin.getEmail()+",";
 		}
 		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
 		if(StringUtils.isNotBlank(adminIds))adminIds.substring(0, adminIds.length()-1);