|
|
@@ -35,6 +35,8 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
public Integer rows = 10;// 每页显示的行数rows
|
|
|
|
|
|
@Resource
|
|
|
+ public ArticleTweetService articleTweetService;
|
|
|
+ @Resource
|
|
|
public WorkflowService workflowService;
|
|
|
@Resource
|
|
|
public FileService fileService;
|
|
|
@@ -158,6 +160,17 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
int n = bookingCommentService.update(bookingComment);
|
|
|
m = workflowService.update(workflow1);
|
|
|
} break;
|
|
|
+ //region
|
|
|
+ //2023-10-11 A-jax添加推文的审批操作
|
|
|
+ case 3: {
|
|
|
+ ArticleTweet articleTweet = articleTweetService.queryArticleById(workflow1.getLinkId());
|
|
|
+ workflow1.setStatus(workflow.getStatus());
|
|
|
+ articleTweet.setApprove(workflow.getStatus());
|
|
|
+ int n = articleTweetService.updateArticleApprove(articleTweet);
|
|
|
+ m = workflowService.update(workflow1);
|
|
|
+
|
|
|
+ }
|
|
|
+ //endregion
|
|
|
}
|
|
|
if (m > 0) {
|
|
|
resultJson.put("message", "审批成功");
|
|
|
@@ -193,7 +206,14 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
List<FileInfo> fileInfoList;
|
|
|
if (workflow.getStatus() == 2 && workflow.getType() == 1){
|
|
|
fileInfoList = fileService.queryList("and link_id = '"+workflow.getLinkId()+"'");
|
|
|
- }else {
|
|
|
+ }
|
|
|
+ //region
|
|
|
+ //2023-10-11 A-jax添加推文流程数据获取逻辑
|
|
|
+ else if(workflow.getType() == 3){
|
|
|
+ fileInfoList = articleTweetService.queryList("and link_id = '"+workflow.getLinkId()+"'");
|
|
|
+ }
|
|
|
+ //endregion
|
|
|
+ else {
|
|
|
fileInfoList = fileService.queryList("and link_id = '"+workflow.getId()+"'");
|
|
|
}
|
|
|
workflow.setFileInfoList(fileInfoList);
|