Bladeren bron

社区审批

夏文涛 2 jaren geleden
bovenliggende
commit
464b1d27f6

+ 6 - 0
mhotel/src/com/happy/Model/Workflow.java

@@ -9,6 +9,9 @@ public class Workflow {
     private String id;
     /**
      * 类型
+     * 民宿信息:1
+     * 投诉:2
+     * 推文:3
      */
     private Integer type;
     /**
@@ -21,6 +24,9 @@ public class Workflow {
     private String linkId;
     /**
      * 状态
+     * 正在审批:1
+     * 审批通过:2
+     * 拒绝:3
      */
     private Integer status;
     /**

+ 21 - 1
mhotel/src/com/happy/action/WorkflowAction.java

@@ -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);

+ 12 - 1
mhotel/src/com/happy/service/impl/WorkflowImplService.java

@@ -3,6 +3,7 @@ package com.happy.service.impl;
 import com.happy.Model.BookingComment;
 import com.happy.Model.FileInfo;
 import com.happy.Model.Workflow;
+import com.happy.dao.ArticleTweetDao;
 import com.happy.dao.FileInfoDao;
 import com.happy.dao.HouseNumberDao;
 import com.happy.dao.WorkflowDao;
@@ -21,6 +22,9 @@ public class WorkflowImplService implements WorkflowService {
     @Resource
     public FileInfoDao fileDao;
 
+    @Resource
+    public ArticleTweetDao articleTweetDao;
+
     @Override
     public int insert(Workflow workflow) {
         return workflowDao.insert(workflow);
@@ -45,7 +49,14 @@ public class WorkflowImplService implements WorkflowService {
                 List<FileInfo> fileInfoList;
                 if (workflow.getStatus() == 2 && workflow.getType() == 1 || workflow.getType() == 2){
                     fileInfoList = fileDao.queryList("and link_id = '"+workflow.getLinkId()+"'");
-                }else {
+                }
+                //region
+                //2023-10-11 A-jax添加推文流程数据获取逻辑
+                else if(workflow.getType() == 3){
+                    fileInfoList = articleTweetDao.queryList("and link_id = '"+workflow.getLinkId()+"'");
+                }
+                //endregion
+                else {
                     fileInfoList = fileDao.queryList("and link_id = '"+workflow.getId()+"'");
                 }
                 workflow.setFileInfoList(fileInfoList);

+ 2 - 0
mhotel/src/struts.xml

@@ -63,6 +63,8 @@
 		<action name="complaint*" method = "{1}" class="com.happy.action.AppBookingComplaintAction"></action>
 		<action name="hc*" method = "{1}" class="com.happy.action.AppHotelCouponAction"></action>
 
+		<action name="article*" method = "{1}" class="com.happy.action.articleTweetAction"></action>
+
 	</package>
 	<package name="interfaces" namespace="/interfaces" extends="struts-default">
 		<!-- 接口总调度开始 -->