调整流程流转记录和自动审批

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -469,8 +469,8 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         List<BaseStudentFamily> insertFamilyList = new ArrayList();
         List<BaseStudentContact> insertContactList = new ArrayList();
 
-//        long createUserId = StpUtil.getLoginIdAsLong();
-        long createUserId = 1000000000000000000L;
+        long createUserId = StpUtil.getLoginIdAsLong();
+//        long createUserId = 1000000000000000000L;
         int row = 3;
         for (Map<Integer, Object> dataMaps : excelDataList) {
             if(dataMaps.get(0) == null){

src/main/java/com/xjrsoft/module/workflow/controller/WorkflowExecuteController.java

@@ -343,6 +343,8 @@ public class WorkflowExecuteController {
         return RT.ok(userDefinedProcessRecordListVos);
     }
 
+
+
     @GetMapping("/audit-approve-record-list")
     @ApiOperation(value = "审核用自定义流程记录列表")
     public RT<List<UserDefinedProcessRecordListVo>> auditApproveRecordList(@Valid ApproveRecordListDto dto) {

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -5656,7 +5656,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 record.setRecordTime(LocalDateTime.now().minusSeconds(+1));//时间设置提前1秒钟，好排序
 
 //                    record.setMessage("【审批人:" + user.getName() + "】 将 【任务:" + task.getName() + "】 驳回到 【任务:" + rejectUserTaskConfig.getName() + "】");
-                record.setMessage("审批信息：由于审批超时，【系统】【自动驳回】审批,审批意见为：“系统自动驳回审批”，由【" + task.getName() + "】 流转到【" + rejectUserTaskConfig.getName() + "】");
+//                record.setMessage("审批信息：由于审批超时，【系统】【自动驳回】审批,审批意见为：“系统自动驳回审批”，由【" + task.getName() + "】 流转到【" + rejectUserTaskConfig.getName() + "】");
+                String message = "【审阅】未选择【" + task.getName() + "】，系统已自动驳回，请重新【审阅】并选择【" + task.getName() + "】";
+                record.setMessage(message);
                 workflowRecordMapper.insert(record);
 
                 //新增流程发起流程记录
@@ -5757,11 +5759,12 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             if (commentArr.length > 1) {
                 String[] approveUserNameArr = commentArr[0].split("：");
                 String[] approveResultArr = commentArr[1].split("：");
+                UserDefinedProcessRecordListVo recordListVo = new UserDefinedProcessRecordListVo();
+                recordListVo.setIsReject(0);
                 if (approveResultArr.length > 1 && "驳回".equals(approveResultArr[1])) {
-                    continue;
+                    recordListVo.setIsReject(1);
                 }
-                String[] approveCommentArr = commentArr[2].split("：");
-                UserDefinedProcessRecordListVo recordListVo = new UserDefinedProcessRecordListVo();
+
                 recordListVo.setNodeType(p.getNodeType());
                 recordListVo.setShowNode(p.getShowNode());
                 recordListVo.setNodeName(p.getNodeName());

src/main/java/com/xjrsoft/module/workflow/vo/PendingTaskVo.java

@@ -57,4 +57,7 @@ public class PendingTaskVo {
 
     @ApiModelProperty("审批人id")
     private String approveUserIds;
+
+    @ApiModelProperty("驳回状态")
+    private String rejectState;
 }

src/main/java/com/xjrsoft/module/workflow/vo/UserDefinedProcessRecordListVo.java

@@ -23,4 +23,7 @@ public class UserDefinedProcessRecordListVo extends ProcessRecordListVo{
     @ApiModelProperty("审批人姓名")
     @TableField(exist = false)
     private String approveUserName;
+
+    @ApiModelProperty("是否是驳回信息（0：是 1：否）")
+    private Integer isReject;
 }