消息中心代调整；新增审批表-申请人id-字段

service-oa/service-oa-biz/src/main/java/com/usky/oa/domain/OaApproval.java

@@ -39,6 +39,11 @@ public class OaApproval implements Serializable {
      */
     private Long approvalUid;
 
+    /**
+     * 申请人id
+     */
+    private Integer proposer;
+
     /**
      * 审批类型（0:审批，1:知会）
      */

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaApprovalServiceImpl.java

@@ -15,6 +15,7 @@ import com.usky.oa.mapper.OaDocumentMapper;
 import com.usky.oa.service.OaApprovalService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.oa.service.vo.OaApprovalCountVO;
+import com.usky.system.domain.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaDocumentServiceImpl.java

@@ -156,7 +156,6 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
     }
 
     // 提交单据
-    @Transactional
     @Override
     public void submit(String docNo, Integer docStatus) {
         if (docStatus != 1) {
@@ -173,6 +172,7 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         Integer tenantId = SecurityUtils.getTenantId();
         String username = SecurityUtils.getUsername();
+        Long userId = SecurityUtils.getUserId();
         LocalDateTime now = LocalDateTime.now();
 
         String formSign = getFormSign(docNo);
@@ -207,6 +207,7 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         // 随机选择一个审批人（涛、哲)
         long approvalUid = RandomUtils.nextBoolean() ? 101 : 105;
         oaApproval.setApprovalUid(approvalUid);
+        oaApproval.setProposer(Math.toIntExact(userId));
         oaApproval.setCreateBy(username);
         oaApproval.setCreateTime(now);
         oaApproval.setSubmitDate(now);
@@ -216,7 +217,7 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
 
         // 发送审批消息
         List<Long> receivers = Collections.singletonList(oaApproval.getApprovalUid());
-        oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), oaApproval.getApprovalUid(), oaApproval.getId(), receivers);
+        oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), userId, oaApproval.getId(), receivers);
     }
 
     // 获取单据类型

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaJbdDocumentServiceImpl.java

@@ -93,6 +93,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
             oaApproval.setType(0);
             oaApproval.setApprovalStatus(1);
             oaApproval.setApprovalUid(105L);
+            oaApproval.setProposer(Math.toIntExact(userId));
             oaApproval.setCreateBy(oaJbdDocument.getCreateBy());
             oaApproval.setCreateTime(now);
             oaApproval.setSubmitDate(now);
@@ -102,7 +103,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
 
             // 发送审批消息
             List<Long> receivers = Collections.singletonList(oaApproval.getApprovalUid());
-            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), oaApproval.getApprovalUid(), oaApproval.getId(), receivers);
+            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), userId, oaApproval.getId(), receivers);
         }
     }
 
@@ -113,6 +114,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
         }
 
         LocalDateTime now = LocalDateTime.now();
+        Long userId = SecurityUtils.getUserId();
 
         validateOaJbDocument(oaJbdDocument);
         oaJbdDocument.setUpdateBy(SecurityUtils.getUsername());
@@ -134,6 +136,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
             oaApproval.setType(0);
             oaApproval.setApprovalStatus(1);
             oaApproval.setApprovalUid(105L);
+            oaApproval.setProposer(Math.toIntExact(userId));
             oaApproval.setCreateBy(oaJbdDocument.getCreateBy());
             oaApproval.setCreateTime(now);
             oaApproval.setSubmitDate(now);
@@ -143,7 +146,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
 
             // 发送审批消息
             List<Long> receivers = Collections.singletonList(oaApproval.getApprovalUid());
-            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), oaApproval.getApprovalUid(), oaApproval.getId(), receivers);
+            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), userId, oaApproval.getId(), receivers);
         }
     }
 

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaQjdDocumentServiceImpl.java

@@ -106,6 +106,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
             oaApproval.setType(0);
             oaApproval.setApprovalStatus(1);
             oaApproval.setApprovalUid(101L);
+            oaApproval.setProposer(Math.toIntExact(userId));
             oaApproval.setCreateBy(username);
             oaApproval.setCreateTime(now);
             oaApproval.setSubmitDate(now);
@@ -115,7 +116,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
 
             // 发送审批消息
             List<Long> receivers = Collections.singletonList(oaApproval.getApprovalUid());
-            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), oaApproval.getApprovalUid(), oaApproval.getId(), receivers);
+            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), userId, oaApproval.getId(), receivers);
         }
     }
 
@@ -131,6 +132,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
         LocalDateTime now = LocalDateTime.now();
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         Integer tenantId = SecurityUtils.getTenantId();
+        Long userId = SecurityUtils.getUserId();
 
         oaQjdDocument.setUpdateBy(username);
         oaQjdDocument.setUpdateTime(now);
@@ -150,6 +152,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
             oaApproval.setType(0);
             oaApproval.setApprovalStatus(1);
             oaApproval.setApprovalUid(101L);
+            oaApproval.setProposer(Math.toIntExact(userId));
             oaApproval.setCreateBy(username);
             oaApproval.setCreateTime(now);
             oaApproval.setSubmitDate(now);
@@ -159,7 +162,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
 
             // 发送审批消息
             List<Long> receivers = Collections.singletonList(oaApproval.getApprovalUid());
-            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), oaApproval.getApprovalUid(), oaApproval.getId(), receivers);
+            oaSendMessageCenter.sendAsyncMessage(oaApproval.getCreateBy(), userId, oaApproval.getId(), receivers);
         }
     }
 

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/utils/OaSendMessageCenter.java

@@ -11,6 +11,7 @@ import com.usky.system.domain.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Async;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -35,6 +36,7 @@ public class OaSendMessageCenter {
     private static final String INFO_CONTENT = "的申请";
     private static final int INFO_TYPE = 3;
 
+    @Async
     public void sendAsyncMessage(String username, Long submitterId, Integer id, List<Long> receivers) {
 
         log.info(username + "的申请开始发送消息中心-----------------------------------");

service-oa/service-oa-biz/src/main/resources/mapper/oa/OaApprovalMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="doc_no" property="docNo" />
         <result column="approval_uid" property="approvalUid" />
+        <result column="proposer" property="proposer" />
         <result column="type" property="type" />
         <result column="approval_status" property="approvalStatus" />
         <result column="opinion" property="opinion" />