不合格企业微信发送

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -839,7 +839,18 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 
 			//发企业微信--------------------开始（跟班组有关）
 			SysNoticeGroup noticeQo = new SysNoticeGroup();
-			noticeQo.setNoticeId(9L);
+            if(qcCheckTaskIncome.getCheckType().equals("checkTypeLL")){
+				noticeQo.setNoticeId(9L);
+			}else if(qcCheckTaskIncome.getCheckType().equals("checkTypeSC")){
+				noticeQo.setNoticeId(13L);
+			}else if(qcCheckTaskIncome.getCheckType().equals("checkTypeSCXJ")){
+				noticeQo.setNoticeId(14L);
+			}else if(qcCheckTaskIncome.getCheckType().equals("checkTypeCP")){
+				noticeQo.setNoticeId(15L);
+			}else if(qcCheckTaskIncome.getCheckType().equals("checkTypeCPPC")){
+				noticeQo.setNoticeId(16L);
+			}
+
 			List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo);
 			if(!CollectionUtils.isEmpty(notices)) {
 				List<WechartDTO> wecharts = new ArrayList<>();
@@ -852,6 +863,12 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 								.replace("${checkNo}", qcCheckTaskIncome.getCheckNo()+"\n")
 								.replace("${supplierName}", qcCheckTaskIncome.getSupplierName()+"\n")
 								.replace("${quality}", qcCheckTaskIncome.getQuality()+"\n");
+						if(StringUtils.isNotBlank(qcCheckTaskIncome.getIncomeBatchNo())){
+							contentInfo = contentInfo.replace("${incomeBatchNo}", qcCheckTaskIncome.getIncomeBatchNo()+"\n");
+						}
+						if(StringUtils.isNotBlank(qcCheckTaskIncome.getOrderNo())){
+							contentInfo = contentInfo.replace("${orderNo}", qcCheckTaskIncome.getOrderNo()+"\n");
+						}
 						Matcher m = p2.matcher(contentInfo);
 						contentInfo = m.replaceAll("");
 						wechart0.setText(contentInfo);