Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/activiti/listener/ProcessEventListener.java

@@ -372,7 +372,7 @@ public class ProcessEventListener implements ActivitiEventListener, Serializable
                 templateParam.put("approveRemark", tfFlowLog.getApproveRemark());
 
                 sysMessage = new SysMessage(tfCustomFlowEntity.getCrmNo(), tfCustomFlowEntity.getCode(),
-                        MessageTypeEnum.EXCEPTION_APPROVE, type.name(), flowTaskMsgResult.getServiceId(), tfCustomFlowEntity.getCreateId(), content);
+                        MessageTypeEnum.EXCEPTION_APPROVE, type.name(), flowTaskMsgResult.getServiceId(), tfCustomFlowEntity.getCreateId(), content,tfCustomFlowEntity.getCreateId());
             } else if (type == TFCustomTypeEnum.PROJECT_EXCHANGE_FLOW) {//项目计划变更
                 content = MessageEnum.NOTICE_OF_PROJECT_EXCHANGE.getTemplate();
                 content = content.replaceAll("\\$\\{userName\\}", flowTaskMsgResult.getRealName());
@@ -386,7 +386,7 @@ public class ProcessEventListener implements ActivitiEventListener, Serializable
                 templateParam.put("exchangeType", flowTaskMsgResult.getExchangeType().getTitle());
 
                 sysMessage = new SysMessage(tfCustomFlowEntity.getCrmNo(), tfCustomFlowEntity.getCode(),
-                        MessageTypeEnum.SYSTEM_PLAN_CHANGE, type.name(), flowTaskMsgResult.getServiceId(), tfCustomFlowEntity.getCreateId(), content);
+                        MessageTypeEnum.SYSTEM_PLAN_CHANGE, type.name(), flowTaskMsgResult.getServiceId(), tfCustomFlowEntity.getCreateId(), content,tfCustomFlowEntity.getCreateId());
             }
             //发送消息
             sysMessageService.saveSysMessage(Arrays.asList(sysMessage));

sop-business/src/main/java/com/qmth/sop/business/entity/SysMessage.java

@@ -74,7 +74,7 @@ public class SysMessage implements Serializable {
 
     }
 
-    public SysMessage(String crmNo, String code, MessageTypeEnum type, String objType, Long serviceId, Long receiveUserId, String content) {
+    public SysMessage(String crmNo, String code, MessageTypeEnum type, String objType, Long serviceId, Long receiveUserId, String content,Long formUserId) {
         this.id = SystemConstant.getDbUuid();
         this.crmNo = crmNo;
         this.code = code;
@@ -85,6 +85,7 @@ public class SysMessage implements Serializable {
         this.content = content;
         this.sendTime = System.currentTimeMillis();
         this.status = false;
+        this.formUserId = formUserId;
     }
 
     public String getCode() {

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBViolationServiceImpl.java

@@ -105,7 +105,7 @@ public class TBViolationServiceImpl extends ServiceImpl<TBViolationMapper, TBVio
                 templateParam.put("violationType", tbViolationResult.getType().getTitle());
 
                 SysMessage sysMessage = new SysMessage(tBViolation.getCrmNo(), tBViolation.getCode(),
-                        MessageTypeEnum.VIOLATION, tBViolation.getType().name(), tBViolation.getServiceId(), tBViolation.getUserId(), tBViolation.getContent());
+                        MessageTypeEnum.VIOLATION, tBViolation.getType().name(), tBViolation.getServiceId(), tBViolation.getUserId(), tBViolation.getContent(),sysUser.getId());
                 sysMessageService.saveSysMessage(Collections.singletonList(sysMessage));
                 //发送短信
                 smsSendUtil.sendSms(tbViolationResult.getMobileNumber(), configKey, templateParam);

sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -65,7 +65,7 @@
     </select>
 
     <select id="pageByTypes" resultType="com.qmth.sop.business.bean.result.SysMessageWorkResult">
-        SELECT
+        SELECT distinct
         m.id,
         m.type message_type,
         m.receive_time,

sop-task/src/main/java/com/qmth/sop/task/job/RemindTaskJob.java

@@ -46,7 +46,7 @@ public class RemindTaskJob extends QuartzJobBean {
 
     @Override
     @Transactional
-    protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+    public void executeInternal(JobExecutionContext context) throws JobExecutionException {
         log.info("flowTaskQuartzJob,context:{}", context);
         try {
             JobDataMap map = context.getJobDetail().getJobDataMap();
@@ -78,7 +78,7 @@ public class RemindTaskJob extends QuartzJobBean {
                                 templateParam.put("flowName", strs[0] + "【" + strs[1] + "】");
 
                                 sysMessage = new SysMessage(flowTaskSmsResult.getCrmNo(), tsJobRemind.getCode(),
-                                        MessageTypeEnum.BEFORE, flowTaskSmsResult.getType().name(), flowTaskSmsResult.getServiceId(), flowTaskSmsResult.getUserId(), content);
+                                        MessageTypeEnum.BEFORE, flowTaskSmsResult.getType().name(), flowTaskSmsResult.getServiceId(), flowTaskSmsResult.getUserId(), content,tsJobRemind.getCreateId());
                             } else if (tsJobRemind.getRemindType() == JobTypeEnum.AFTER) {
                                 content = MessageEnum.NOTICE_OF_DELAY_REMIND.getTemplate();
                                 content = content.replaceAll("\\$\\{userName\\}", flowTaskSmsResult.getRealName());
@@ -92,7 +92,7 @@ public class RemindTaskJob extends QuartzJobBean {
                                 templateParam.put("flowName", strs[0] + "【" + strs[1] + "】");
 
                                 sysMessage = new SysMessage(flowTaskSmsResult.getCrmNo(), tsJobRemind.getCode(),
-                                        MessageTypeEnum.AFTER, flowTaskSmsResult.getType().name(), flowTaskSmsResult.getServiceId(), flowTaskSmsResult.getUserId(), content);
+                                        MessageTypeEnum.AFTER, flowTaskSmsResult.getType().name(), flowTaskSmsResult.getServiceId(), flowTaskSmsResult.getUserId(), content,tsJobRemind.getCreateId());
                             }
                             //发送消息
                             sysMessageService.saveSysMessage(Arrays.asList(sysMessage));