|
|
@@ -226,6 +226,8 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
|
|
|
LabCheckConfig checkConfigInfo = labCheckConfigService.getCheckConfigInfo();
|
|
|
if (checkConfigInfo != null) {
|
|
|
boolean senMsg = false;
|
|
|
+ //String count="您有新的整改报告需要审批,请注意查看";//发送的内容
|
|
|
+
|
|
|
LabCheckRecord checkRecord = labCheckRecordService.selectLabCheckRecordById(checkRecordId);
|
|
|
|
|
|
if (checkRecord != null) {
|
|
|
@@ -359,6 +361,7 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
|
|
|
labMessageContent.setSendMode(2);
|
|
|
labMessageContent.setSendRange(3);
|
|
|
labMessageContent.setMessClass(1);
|
|
|
+ //labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
|
|
|
labMessageContent.setContent(count != null ? count : checkConfigInfo.getCheckAppMsg());
|
|
|
labMessageContent.setUserIds(userId + "");
|
|
|
|
|
|
@@ -371,6 +374,7 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
|
|
|
labCheckMachineMsg.setCheckRecordId(checkRecordId);
|
|
|
labCheckMachineMsg.setType(type);
|
|
|
labCheckMachineMsg.setCheckMsg(checkConfigInfo.getRectifyAioMsg());
|
|
|
+ //labCheckMachineMsg.setCheckMsg(count!=null?count:checkConfigInfo.getRectifyAioMsg());
|
|
|
SaveUtil.setCommonAttr(labCheckMachineMsg);
|
|
|
|
|
|
senMsg = true;
|
|
|
@@ -381,6 +385,7 @@ public class LabCheckMachineMsgServiceImpl implements ILabCheckMachineMsgService
|
|
|
labMessageContent.setSendMode(2);
|
|
|
labMessageContent.setSendRange(3);
|
|
|
labMessageContent.setMessClass(1);
|
|
|
+ //labMessageContent.setContent(checkConfigInfo.getCheckAppMsg());
|
|
|
labMessageContent.setContent(count != null ? count : checkConfigInfo.getRectifyAppMsg());
|
|
|
labMessageContent.setUserIds(userId + "");
|
|
|
}
|