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

作者:张哲
时间:2022/12/6
类型:开发
描述:审核流程维护

ZizgZh 2 жил өмнө
parent
commit
3ffe5e1911

+ 17 - 0
src/main/java/com/redxun/knowledge/controller/KnowledgeApprovalNodeController.java

@@ -6,16 +6,19 @@ import com.redxun.common.base.db.BaseService;
 
 import com.redxun.common.base.entity.JsonResult;
 import com.redxun.knowledge.entity.dao.KnowledgeApprovalNode;
+import com.redxun.knowledge.entity.dto.KnowledgeApprovalNodeDto;
 import com.redxun.knowledge.entity.vo.KnowledgeApprovalVo;
 import com.redxun.knowledge.service.KnowledgeApprovalNodeServiceImpl;
 import com.redxun.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RestController
@@ -45,5 +48,19 @@ public class KnowledgeApprovalNodeController extends BaseController<KnowledgeApp
         jsonResult.setData(approvalNodes);
         return jsonResult;
     }
+
+    @ApiOperation("批量添加审核流程")
+    @PostMapping("batchInsertApprovalNodes")
+    public JsonResult batchInsertApprovalNodes(@RequestBody List<KnowledgeApprovalNodeDto> knowledgeApprovalNodeDto) {
+        JsonResult jsonResult = JsonResult.getSuccessResult("添加数据成功");
+        List<KnowledgeApprovalNode> knowledgeApprovalNodeList = knowledgeApprovalNodeDto.parallelStream().map(e -> {
+            KnowledgeApprovalNode knowledgeApprovalNode = new KnowledgeApprovalNode();
+            BeanUtils.copyProperties(e, knowledgeApprovalNode);
+            return knowledgeApprovalNode;
+        }).collect(Collectors.toList());
+        knowledgeApprovalNodeService.saveBatch(knowledgeApprovalNodeList);
+        jsonResult.setData(knowledgeApprovalNodeList);
+        return jsonResult;
+    }
 }
 

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

@@ -33,7 +33,7 @@ public class KnowledgeApprovalNode  extends BaseExtEntity<java.lang.String> {
     }
 
     //主键
-    @TableId(value = "PK_ID",type = IdType.INPUT)
+    @TableId(value = "PK_ID",type = IdType.ASSIGN_ID)
 	private String pkId;
 
     //节点名称

+ 62 - 0
src/main/java/com/redxun/knowledge/entity/dto/KnowledgeApprovalNodeDto.java

@@ -0,0 +1,62 @@
+
+/**
+ * <pre>
+ *
+ * 描述:业务--知识审批节点表实体类定义
+ * 表:KM_KNOWLEDGE_APPROVAL_NODE
+ * 作者:zhang_zhe
+ * 邮箱: ray@redxun.cn
+ * 日期:2022-11-23 09:47:26
+ * 版权:辽宁吉亨科技
+ * </pre>
+ */
+package com.redxun.knowledge.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.redxun.common.base.entity.BaseExtEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+@Setter
+@Getter
+@Accessors(chain = true)
+@TableName(value = "KM_KNOWLEDGE_APPROVAL_NODE")
+public class KnowledgeApprovalNodeDto extends BaseExtEntity<String> {
+
+    //主键
+    @TableId(value = "PK_ID",type = IdType.ASSIGN_ID)
+	private String pkId;
+
+    //节点名称
+    @NotBlank(message = "节点名称不能为空")
+    private String name;
+    //审批人ID;人员或者部门ID
+    private String approverId;
+    //审批人名称;可以是人员或者部门名称
+    private String approverName;
+
+    @Override
+    public String getPkId() {
+        return pkId;
+    }
+
+    @Override
+    public void setPkId(String pkId) {
+        this.pkId=pkId;
+    }
+
+
+    /**
+    生成子表属性的Array List
+    */
+
+}
+
+
+

+ 12 - 1
src/main/java/com/redxun/knowledge/service/KnowledgeApprovalNodeServiceImpl.java

@@ -1,10 +1,10 @@
 
 package com.redxun.knowledge.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.redxun.common.base.db.BaseDao;
 import com.redxun.common.base.db.BaseService;
+import com.redxun.common.tool.BeanUtil;
 import com.redxun.common.tool.IdGenerator;
 import com.redxun.common.service.impl.SuperServiceImpl;
 import com.redxun.knowledge.entity.dao.KnowledgeApprovalNode;
@@ -15,6 +15,7 @@ import com.redxun.knowledge.mapper.KnowledgeApprovalNodeMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import javax.annotation.Resource;
 
@@ -35,4 +36,14 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
     public List<KnowledgeApprovalVo> queryApprovalNodes() {
         return knowledgeApprovalNodeMapper.queryApprovalNodes();
     }
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<KnowledgeApprovalNode> entityList, int batchSize) {
+        return super.saveOrUpdateBatch(entityList, batchSize);
+    }
+
+    @Override
+    public int insert(KnowledgeApprovalNode entity) {
+        return 0;
+    }
 }

+ 3 - 0
src/main/resources/mapper/knowledge/KnowledgeMapper.xml

@@ -74,6 +74,9 @@
         <if test="@rx.Ognl@isNotEmpty(params.endTime)">
             and CREATE_TIME_ &lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD')
         </if>
+        <if test="@rx.Ognl@isNotEmpty(params.approvalStatus)">
+            and APPROVAL_STATUS = 5
+        </if>
         and IS_DEL = 0
     </where>
         ORDER BY