Просмотр исходного кода

订单修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 6
Родитель
Сommit
e9960037e5

+ 7 - 5
src/main/java/com/goafanti/common/bo/EmailBo.java

@@ -84,8 +84,9 @@ public class EmailBo {
 	 * @return 
 	 * @return 
 	 */
 	 */
 	public  EmailBo(String subject, String address, String deptname, String sender,
 	public  EmailBo(String subject, String address, String deptname, String sender,
-			String content , String orderNo,String date ,String dunStatusName,String adminName,String userName,Integer type) {
-		this.subject = subject;
+			String content , String orderNo,String date ,String dunStatusName,String adminName,String userName,Integer type,Integer approval) {
+		if(approval !=null&&approval!=0)this.subject = "[特批]"+subject;
+		else this.subject = subject;
 		this.address = address;
 		this.address = address;
 		this.addressee = "";
 		this.addressee = "";
 		this.deptname = deptname;
 		this.deptname = deptname;
@@ -227,8 +228,9 @@ public class EmailBo {
 	}
 	}
 	
 	
 	public String setGeneralFormat() {
 	public String setGeneralFormat() {
+		
 		String str="<table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" bgcolor=\"#ffffff\" style=\"font-family:'Microsoft YaHei';\">\r\n" + 
 		String str="<table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" bgcolor=\"#ffffff\" style=\"font-family:'Microsoft YaHei';\">\r\n" + 
-				"    		<tbody><tr>\r\n" + 
+				"    	<tbody><tr>\r\n" +
 				"		        <td>\r\n" + 
 				"		        <td>\r\n" + 
 				"		             <table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\"></table>\r\n" + 
 				"		             <table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\"></table>\r\n" + 
 				"		        </td>\r\n" + 
 				"		        </td>\r\n" + 
@@ -248,10 +250,10 @@ public class EmailBo {
 				"        		</td>\r\n" + 
 				"        		</td>\r\n" + 
 				"		    </tr>\r\n" + 
 				"		    </tr>\r\n" + 
 				"		    \r\n" + 
 				"		    \r\n" + 
-				"   			<tr>\r\n" + 
+				"   		<tr>\r\n" + 
 				"        		<td>\r\n" + 
 				"        		<td>\r\n" + 
 				"		            \r\n" + 
 				"		            \r\n" + 
-				"		        <table width=\"800\" border=\"0\" align=\"left\" cellpadding=\"0\" cellspacing=\"0\" style=\" border:1px solid #edecec; border-top:none; padding:0 20px;font-size:14px;color:#333333;\">\r\n" + 
+				"		        	<table width=\"800\" border=\"0\" align=\"left\" cellpadding=\"0\" cellspacing=\"0\" style=\" border:1px solid #edecec; border-top:none; padding:0 20px;font-size:14px;color:#333333;\">\r\n" + 
 				"	               		<tbody><tr>\r\n" + 
 				"	               		<tbody><tr>\r\n" + 
 				"              </tr>\r\n" + 
 				"              </tr>\r\n" + 
 				"               <tr>\r\n" + 
 				"               <tr>\r\n" + 

+ 21 - 3
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1234,7 +1234,16 @@ where super_id is null )  e on e.order_no=a.order_no
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	</if>
   	<if test="specially == 3">
   	<if test="specially == 3">
-  	and a.approval = 1 and  a.order_status=2 and a.process_status != 99 
+  	 and  a.order_status=2 and a.process_status != 99 
+  	</if>
+  	<if test="approval ==0">
+  	and a.approval &gt; 1
+  	</if>
+  	<if test="approval ==1">
+  	and a.approval = 1
+  	</if>
+  	<if test="approval ==2">
+  	and a.approval &gt; 1
   	</if>
   	</if>
   	<if test="specially == 4">
   	<if test="specially == 4">
   	and e.main=1
   	and e.main=1
@@ -1327,10 +1336,19 @@ where super_id is null ) e on e.order_no=a.order_no
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	</if>
   	<if test="specially == 3">
   	<if test="specially == 3">
-  	and a.approval = 1 and  a.order_status=2 and a.process_status != 99 
+  	 and  a.order_status=2 and a.process_status != 99 
+  	</if>
+  	<if test="approval ==0">
+  	and a.approval &gt; 1
+  	</if>
+  	<if test="approval ==1">
+  	and a.approval = 1
+  	</if>
+  	<if test="approval ==2">
+  	and a.approval &gt; 1
   	</if>
   	</if>
   	<if test="specially == 4">
   	<if test="specially == 4">
-  	 and e.main=1
+  	and e.main=1
   	and a.process_status in (4,5,6,99)
   	and a.process_status in (4,5,6,99)
   	and a.order_status not in(5,7)
   	and a.order_status not in(5,7)
   	</if>
   	</if>

+ 4 - 1
src/main/java/com/goafanti/common/utils/SendEmailUtil.java

@@ -137,11 +137,14 @@ public class SendEmailUtil {
 	
 	
 	public static boolean isEmail(String email){
 	public static boolean isEmail(String email){
     	//邮箱正则表达式
     	//邮箱正则表达式
-        String pattern = "^[a-zA-Z][\\w\\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\\w\\.-]*[a-zA-Z0-9]\\.[a-zA-Z][a-zA-Z\\.]*[a-zA-Z]$";
+        String pattern = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
         Pattern p = Pattern.compile(pattern);
         Pattern p = Pattern.compile(pattern);
         Matcher m = p.matcher(email);
         Matcher m = p.matcher(email);
         return m.matches();
         return m.matches();
     }
     }
 
 
+	/*public static void main(String[] args) {
+		System.out.println(isEmail("anderx@dingtalk.com"));
+	}*/
 	
 	
 }
 }

+ 2 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -244,10 +244,10 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 */
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,
+	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer approval,
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo,Integer pageSize){
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo,Integer pageSize){
 		Result res=new Result();
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution,depId, contractNo,outsource, liquidationStatus,pageNo, pageSize));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially ,approval, distribution,depId, contractNo,outsource, liquidationStatus,pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
 	
 	

+ 2 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -87,7 +87,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @param pageSize
 	 * @return
 	 * @return
 	 */
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer approval,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo, Integer pageSize);
 	/**
 	/**
 	 * 订单审核
 	 * 订单审核
 	 * @param orderNo
 	 * @param orderNo
@@ -192,7 +192,7 @@ public interface OrderNewService {
 	int updateFinance(String orderNo, String newFinance);
 	int updateFinance(String orderNo, String newFinance);
 	List<TOrderLogBo> selectOrderLog(String orderNo);
 	List<TOrderLogBo> selectOrderLog(String orderNo);
 
 
-	void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId);
+	void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId,Integer approval);
 	void exportOrderTaskData(String orderNo, HttpServletResponse response)throws IOException,BusinessException ;
 	void exportOrderTaskData(String orderNo, HttpServletResponse response)throws IOException,BusinessException ;
 	
 	
 }
 }

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

@@ -214,7 +214,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			c = backMapper.insertSelective(back);
 			c = backMapper.insertSelective(back);
 			List<String> aids = new ArrayList<>();
 			List<String> aids = new ArrayList<>();
 			aids.add(t.getSalesmanId());;
 			aids.add(t.getSalesmanId());;
-			orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+			orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId(),t.getApproval());
 		}
 		}
 		return c;
 		return c;
 	}
 	}
@@ -513,7 +513,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		tl.setProcess(OrderLogProcess.CWPD.getCode());
 		tl.setProcess(OrderLogProcess.CWPD.getCode());
 		tl.setRemarks(remarks);
 		tl.setRemarks(remarks);
 		tOrderLogMapper.insertSelective(tl);
 		tOrderLogMapper.insertSelective(tl);
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),t.getOrderNo(), TokenManager.getAdminId(),new1.getApproval());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 	}
 
 

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

@@ -331,7 +331,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		
 		
 		}
 		}
 		//发送站内信息与邮件
 		//发送站内信息与邮件
-		orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o.getOrderNo(), TokenManager.getAdminId(),0);
 		
 		
 	}
 	}
 	
 	
@@ -476,7 +476,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		alist.add(o.getSalesmanId());
 		alist.add(o.getSalesmanId());
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
-		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), TokenManager.getAdminId(),0);
 		return 1;
 		return 1;
 	}
 	}
 	@Override
 	@Override

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -83,7 +83,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 				}
 				}
 			}
 			}
 		}
 		}
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),0);
 	}
 	}
 
 
 	@Override
 	@Override
@@ -168,7 +168,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			//重新计算开票金额
 			//重新计算开票金额
 			
 			
 		}
 		}
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),0);
 		tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 		tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 		if(examine==2)tOrderMidMapper.updateInvoice(t2.getOrderNo());
 		if(examine==2)tOrderMidMapper.updateInvoice(t2.getOrderNo());
 		return 1; 
 		return 1; 
@@ -230,7 +230,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			}
 			}
 		
 		
 		}
 		}
-		orderNewService.pushGeneralSendNoticeAndEmail(aids,type,o.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids,type,o.getOrderNo(), TokenManager.getAdminId(),0);
 		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 	}
 	}
 
 

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

@@ -295,7 +295,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), "营销管理员"));
 			aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), "营销管理员"));
 			type=NoticeStatus.ORDER_START.getCode();
 			type=NoticeStatus.ORDER_START.getCode();
-			pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+			pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t.getApproval());
 		}
 		}
 		if (t2.getApproval()==ApprovalNewState.BH.getCode()||
 		if (t2.getApproval()==ApprovalNewState.BH.getCode()||
 				t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
 				t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
@@ -478,7 +478,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,
+	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer pageNo, Integer pageSize) {
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -498,6 +498,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (null!=liquidationStatus) params.put("liquidationStatus", liquidationStatus);
 		if (null!=liquidationStatus) params.put("liquidationStatus", liquidationStatus);
+		if (null!=approval)params.put("approval", approval);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
@@ -572,7 +573,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		}
 		t.setOrderStatus(orderStatus);
 		t.setOrderStatus(orderStatus);
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
-		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		return 1; 
 		return 1; 
 	}
 	}
 
 
@@ -628,7 +629,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//发送驳回邮件
 			//发送驳回邮件
 		if(SendEmailUtil.isEmail(b.getEmail())) {
 		if(SendEmailUtil.isEmail(b.getEmail())) {
 	    	 EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
 	    	 EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
-						"", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),dunTypeName,a2.getName(),b.getUserName(),1);
+						"", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),dunTypeName,a2.getName(),b.getUserName(),1,0);
 				if(StringUtils.isNotBlank(b.getEmail())) {
 				if(StringUtils.isNotBlank(b.getEmail())) {
 					SendEmailUtil.getInstance().patentSend(bo);
 					SendEmailUtil.getInstance().patentSend(bo);
 				}
 				}
@@ -771,7 +772,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			type=NoticeStatus.ORDER_APPROVA_NO.getCode();
 			type=NoticeStatus.ORDER_APPROVA_NO.getCode();
 		}
 		}
 		addOrderLog(tl);
 		addOrderLog(tl);
-		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		//新增特批催款信息
 		//新增特批催款信息
 		
 		
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
@@ -1036,7 +1037,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		addBackOrder(orderNo, reason);
 		addBackOrder(orderNo, reason);
 		List<String> aids = new ArrayList<>();
 		List<String> aids = new ArrayList<>();
 		aids.add(t.getSalesmanId());
 		aids.add(t.getSalesmanId());
-		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId(),t.getApproval());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 	}
 
 
@@ -1128,9 +1129,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
 
     @Async
     @Async
-	public  void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId) {
+	public  void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String orderNo,String adminId,Integer approval) {
 		AdminListBo a = adminMapper.getDeptNameByAid(adminId);
 		AdminListBo a = adminMapper.getDeptNameByAid(adminId);
-		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+OrderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
+		String approvalType="";
+		if (approval!=ApprovalNewState.FTP.getCode()) approvalType="[特批]";
+		String str=approvalType+NoticeStatus.getValueByCode(type)+": 订单编号 -"+orderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
 		String adminIds="";
 		String adminIds="";
 		List<Notice> nlist=new  ArrayList<>();
 		List<Notice> nlist=new  ArrayList<>();
 		for (String string : alist) {
 		for (String string : alist) {
@@ -1149,7 +1152,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(StringUtils.isNotBlank(adminIds)) {
 		if(StringUtils.isNotBlank(adminIds)) {
 			adminIds=adminIds.substring(0, adminIds.length()-1);
 			adminIds=adminIds.substring(0, adminIds.length()-1);
 			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"
 			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"
-					,null,null,null,null,null,0);
+					,null,null,null,null,null,0,approval);
 				try {
 				try {
 					//使用专利邮件模板
 					//使用专利邮件模板
 					SendEmailUtil.getInstance().patentSend(bo);
 					SendEmailUtil.getInstance().patentSend(bo);
@@ -1225,5 +1228,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		
 		
 	}
 	}
 
 
+
+
+
+
 	
 	
 }
 }

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

@@ -138,7 +138,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTaskMapper.updateByPrimaryKey(t);
 		tOrderTaskMapper.updateByPrimaryKey(t);
 		List<String> aids = new ArrayList<>();
 		List<String> aids = new ArrayList<>();
 		aids.add(taskReceiverId);
 		aids.add(taskReceiverId);
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),t.getOrderNo(), TokenManager.getAdminId(),0);
 		updateOrder(t);
 		updateOrder(t);
 		return 1;
 		return 1;
 	}
 	}

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

@@ -122,7 +122,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 			type=NoticeStatus.ORDER_OUTSOURCE_NO.getCode();
 			type=NoticeStatus.ORDER_OUTSOURCE_NO.getCode();
 		}
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		return tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
 		return tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
 	}
 	}