4
0
Эх сурвалжийг харах

作者:张哲
时间:2022/12/7
类型:开发
描述:后台审核详情

ZizgZh 2 жил өмнө
parent
commit
5f777544c8

+ 11 - 6
src/main/java/com/redxun/knowledge/controller/KnowledgeApproveController.java

@@ -4,15 +4,14 @@ package com.redxun.knowledge.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.redxun.common.annotation.ClassDefine;
 import com.redxun.common.base.db.BaseService;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.redxun.common.base.entity.JsonPageResult;
 import com.redxun.common.base.entity.JsonResult;
 import com.redxun.common.base.entity.QueryData;
 import com.redxun.common.base.search.QueryFilter;
 import com.redxun.common.base.search.QueryFilterBuilder;
-import com.redxun.common.tool.StringUtils;
 import com.redxun.common.utils.ExceptionUtil;
 import com.redxun.knowledge.entity.dao.KnowledgeApprove;
+import com.redxun.knowledge.entity.dto.KnowledgeApproveDto;
 import com.redxun.knowledge.service.KnowledgeApproveServiceImpl;
 import com.redxun.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -20,10 +19,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
@@ -64,6 +63,12 @@ public class KnowledgeApproveController extends BaseController<KnowledgeApprove>
         return jsonResult;
     }
 
+    @ApiOperation(value = "知识审核")
+    @PostMapping("knowledgeApproveById")
+    public JsonResult knowledgeApproveById(@RequestBody KnowledgeApproveDto knowledgeApproveDto){
+        return null;
+    }
+
 
 
 }

+ 1 - 1
src/main/java/com/redxun/knowledge/entity/dao/KnowledgeApprove.java

@@ -74,7 +74,7 @@ public class KnowledgeApprove  extends BaseExtEntity<java.lang.String> {
     @TableField(value = "IS_DEL")
     @TableLogic
     private Integer isDel;
-
+    //审核内容
     @TableField(value = "REMARK")
     private String remark;
 

+ 52 - 0
src/main/java/com/redxun/knowledge/entity/dto/KnowledgeApproveDto.java

@@ -0,0 +1,52 @@
+package com.redxun.knowledge.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.redxun.common.base.entity.BaseExtEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 文件名: KnowledgeApproveDto
+ * 作者: Zizg
+ * 时间: 2022/12/7
+ * 描述: 在审核详情时审核填入
+ * 修改人:
+ * 修改时间:
+ * 修改内容:
+ */
+@Setter
+@Getter
+public class KnowledgeApproveDto extends BaseExtEntity<String> {
+
+    //主键
+    @NotBlank(message = "审核记录Id不能为空")
+    private String pkId;
+    //审批结论;0-不通过 1-通过
+    private Integer result;
+    //审批人ID;节点预设人员或者部门ID
+    private String approverId;
+    //审批人名称;可以是人员或者部门名称
+    private String approverName;
+    //实际审批人ID;可以是人员ID或者部门下内部人员ID
+    private String actualApprover;
+    //实际审批人名称;可以是人员名称或者部门下内部人员名称
+    private String actualApproverName;
+    //审批意见
+    private String remark;
+
+    @Override
+    public String getPkId() {
+        return null;
+    }
+
+    @Override
+    public void setPkId(String pkId) {
+
+    }
+}

+ 5 - 0
src/main/java/com/redxun/knowledge/service/KnowledgeApproveServiceImpl.java

@@ -35,6 +35,11 @@ public class KnowledgeApproveServiceImpl extends SuperServiceImpl<KnowledgeAppro
         return knowledgeApproveMapper;
     }
 
+    /**
+     * 审核管理列表(分页查询)
+     * @param filter
+     * @return
+     */
     public IPage findAllKnowledgeApprove(QueryFilter filter) {
         Map<String, Object> params = PageHelper.constructParams(filter);
         IPage page = knowledgeApproveMapper.findAllKnowledgeApprove(filter.getPage(), filter.getParams(), params);