代码优化

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

@@ -94,6 +94,18 @@ public class TBDingApply implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private List<String> approveUserIds;
 
+    @ApiModelProperty(value = "异常类型")
+    @TableField(exist = false)
+    private String dingExceptionTypeStr;
+
+    @ApiModelProperty(value = "当前审核人")
+    @TableField(exist = false)
+    private String approveUserName;
+
+    @ApiModelProperty("异常日期")
+    @TableField(exist = false)
+    private String exceptionTime;
+
     public void setCode(String dingExceptionNo, List<Long> attachmentIdList, Long userId) {
         this.dingExceptionNo = dingExceptionNo;
         setId(SystemConstant.getDbUuid());
@@ -102,6 +114,35 @@ public class TBDingApply implements Serializable {
         this.attachmentIds = Objects.nonNull(attachmentIdList) ? StringUtils.join(attachmentIdList, SystemConstant.LIST_JOIN_SPLIT) : null;
     }
 
+    public String getExceptionTime() {
+        return exceptionTime;
+    }
+
+    public void setExceptionTime(String exceptionTime) {
+        this.exceptionTime = exceptionTime;
+    }
+
+    public String getDingExceptionTypeStr() {
+        if (Objects.nonNull(type)) {
+            String[] strs = type.getTitle().split("｜");
+            return strs[1];
+        } else {
+            return dingExceptionTypeStr;
+        }
+    }
+
+    public void setDingExceptionTypeStr(String dingExceptionTypeStr) {
+        this.dingExceptionTypeStr = dingExceptionTypeStr;
+    }
+
+    public String getApproveUserName() {
+        return approveUserName;
+    }
+
+    public void setApproveUserName(String approveUserName) {
+        this.approveUserName = approveUserName;
+    }
+
     public String getAttachmentPaths() {
         return attachmentPaths;
     }

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

@@ -412,6 +412,17 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
                 }
             }
         }
+        TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(tfFlowApprove.getFlowId());
+        if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getPendApproveId())) {
+            List<String> userList = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
+            List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
+            List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
+            tbDingApply.setApproveUserName(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
+        }
+        TBDing tbDing = tbDingService.getById(tbDingApply.getDingId());
+        if (Objects.nonNull(tbDing)) {
+            tbDingApply.setExceptionTime(tbDing.getSignDate());
+        }
         return new TBDingApplyViewResult(crmProjectResult, tbDingApply, taskIdList, flowTaskHistoryList, currFlowTaskResult, flowApproveHistoryList);
     }
 }