1、修复禅道bug

tool-tech-admin/src/main/java/com/rzdata/web/domain/Document.java

@@ -33,13 +33,14 @@ public class Document extends BaseEntity {
     private String docName;
 
     /** 文档类别 */
-    @Excel(name = "类别", dictType="doc_class")
+    @Excel(name = "文档类别", dictType="doc_class")
     private String docType;
 
     /** 文档负责人 */
     private String docPrincipals;
 
     /** 文档负责人名称 */
+    @Excel(name = "负责人")
     private String docPrincipalsName;
 
     /** 归属单位 **/
@@ -50,17 +51,16 @@ public class Document extends BaseEntity {
     private String docRespDept;
 
     /** 文档来源 */
-    @Excel(name = "来源", dictType="doc_source")
+    @Excel(name = "文档来源", dictType="doc_source")
     private String docSource;
 
     /**
      * 工具名称
      */
-    @Excel(name = "工具名称")
     private String toolName;
 
     /** 文档状态 */
-    @Excel(name = "上传状态", dictType="doc_upload_status")
+    @Excel(name = "文档状态", dictType="doc_upload_status")
     private String docStatus;
 
     /** 文档地址 */

tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java

@@ -1,10 +1,12 @@
 package com.rzdata.web.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.rzdata.common.annotation.Excel;
 import com.rzdata.common.core.domain.BaseEntity;
 import com.rzdata.web.domain.bo.BpmClientInputModelBo;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,23 +41,23 @@ public class Tool extends BaseEntity
     private String toolSourceName;
 
     /** 用途 */
-    @Excel(name = "工具用途",sort=7)
+    //@Excel(name = "工具用途",sort=7)
     private String toolUse;
 
     /** 测试情况 */
-    @Excel(name = "测评情况",sort=8)
+    //@Excel(name = "测评情况",sort=8)
     private String testSituation;
 
     /** 功能描述 */
-    @Excel(name = "功能描述",sort=9)
+    //@Excel(name = "功能描述",sort=9)
     private String functionDesc;
 
     /** 适用条件 */
-    @Excel(name = "适用条件",sort=10)
+    //@Excel(name = "适用条件",sort=10)
     private String applyCondition;
 
     /** 操作说明 */
-    @Excel(name = "操作说明",sort=11)
+    //@Excel(name = "操作说明",sort=11)
     private String operateExplain;
 
     /** 负责人 */
@@ -76,7 +78,7 @@ public class Tool extends BaseEntity
     private String status;
 
     /** 备注 */
-    @Excel(name = "备注",sort=12)
+    //@Excel(name = "备注",sort=12)
     private String remark;
 
     /** 关联工具 */
@@ -85,8 +87,14 @@ public class Tool extends BaseEntity
     private BpmClientInputModelBo bpmClientInputModel;
 
     /** done：办结，doing：进行中**/
+    @Excel(name = "流程状态",dictType="flow_status",sort=7)
     private String recordStatus;
 
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", dateFormat="yyyy-MM-dd")
+    private Date createTime;
+
     private Boolean editStatus;
 
     private String procInstId;
@@ -115,4 +123,5 @@ public class Tool extends BaseEntity
     private List<String> toolIdList;
     /** 需要过滤的主键 **/
     private List<String> filterToolIds;
+    private String recordStatusName;
 }

tool-tech-admin/src/main/java/com/rzdata/web/service/IDocumentCategoryService.java

@@ -1,5 +1,6 @@
 package com.rzdata.web.service;
 
+import com.rzdata.common.core.domain.ToolTreeSelect;
 import com.rzdata.common.core.domain.TreeSelect;
 import com.rzdata.common.core.domain.DocumentCategory;
 
@@ -67,5 +68,5 @@ public interface IDocumentCategoryService
      * @param documentCategory
      * @return
      */
-    List<TreeSelect> selectDocumentTreeList(DocumentCategory documentCategory);
+    List<ToolTreeSelect> selectDocumentTreeList(DocumentCategory documentCategory);
 }

tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DocumentCategoryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.rzdata.web.service.impl;
 
 import cn.hutool.core.lang.Snowflake;
+import com.rzdata.common.core.domain.ToolTreeSelect;
 import com.rzdata.common.core.domain.TreeSelect;
 import com.rzdata.common.utils.DateUtils;
 import com.rzdata.common.utils.SecurityUtils;
@@ -109,15 +110,15 @@ public class DocumentCategoryServiceImpl implements IDocumentCategoryService
     }
 
     @Override
-    public List<TreeSelect> selectDocumentTreeList(DocumentCategory documentCategory) {
+    public List<ToolTreeSelect> selectDocumentTreeList(DocumentCategory documentCategory) {
         List<DocumentCategory> documentCategoryList = documentCategoryMapper.selectDocumentCategoryList(documentCategory);
         return buildDeptTreeSelect(documentCategoryList);
     }
 
-    public List<TreeSelect> buildDeptTreeSelect(List<DocumentCategory> documentCategory)
+    public List<ToolTreeSelect> buildDeptTreeSelect(List<DocumentCategory> documentCategory)
     {
         List<DocumentCategory> docCategoryTree = buildDeptTree(documentCategory);
-        return docCategoryTree.stream().map(TreeSelect::new).collect(Collectors.toList());
+        return docCategoryTree.stream().map(ToolTreeSelect::new).collect(Collectors.toList());
     }
 
     public List<DocumentCategory> buildDeptTree(List<DocumentCategory> documentCategoryList)

tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DocumentServiceImpl.java

@@ -448,6 +448,7 @@ public class DocumentServiceImpl implements IDocumentService
                     break;
                 }
             }
+
             if( StrUtil.isNotBlank(item.getDocRespDept())){
                 item.setDocRespDeptName(sysDeptService.getDeptName(item.getDocRespDept()));
             }

tool-tech-admin/src/main/java/com/rzdata/web/service/impl/ToolServiceImpl.java

@@ -418,6 +418,7 @@ public class ToolServiceImpl implements IToolService
         List<SysDictData> toolSource = sysDictTypeService.selectDictDataByType("tool_source");
         List<SysDictData> toolTypeList = sysDictTypeService.selectDictDataByType("tool_type");
         List<SysDictData> toolStatus = sysDictTypeService.selectDictDataByType("tool_status");
+        List<SysDictData> flowStatusList = sysDictTypeService.selectDictDataByType("flow_status");
 
         for (Tool item : tools) {
             for (SysDictData sysDictData : toolSource) {
@@ -440,6 +441,12 @@ public class ToolServiceImpl implements IToolService
                     break;
                 }
             }
+            for (SysDictData sysDictData : flowStatusList) {
+                if(sysDictData.getDictValue().equals(item.getRecordStatus())){
+                    item.setRecordStatusName(sysDictData.getDictLabel());
+                    break;
+                }
+            }
            if( StrUtil.isNotBlank(tool.getToolRespDept())){
                item.setToolRespDeptName(sysDeptService.getDeptName(tool.getToolRespDept()));
            }

tool-tech-common/src/main/java/com/rzdata/common/core/domain/ToolTreeSelect.java

@@ -36,4 +36,13 @@ public class ToolTreeSelect implements Serializable
     {
 
     }
+
+
+    public ToolTreeSelect(DocumentCategory docCategory)
+    {
+        this.id = docCategory.getId();
+        this.label = docCategory.getCategoryName();
+        this.types = docCategory.getTypes();
+        this.children = docCategory.getChildren().stream().map(ToolTreeSelect::new).collect(Collectors.toList());
+    }
 }

tool-tech-common/src/main/java/com/rzdata/common/core/domain/TreeSelect.java

@@ -20,7 +20,7 @@ public class TreeSelect implements Serializable
 
     /** 节点ID */
     private Long id;
-
+    private String categoryId;
     /** 节点名称 */
     private String label;
 
@@ -54,6 +54,7 @@ public class TreeSelect implements Serializable
     public TreeSelect(DocumentCategory docCategory)
     {
         this.id = Long.valueOf(docCategory.getId());
+        this.categoryId = docCategory.getId();
         this.label = docCategory.getCategoryName();
         this.types = docCategory.getTypes();
         this.children = docCategory.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());

tool-tech-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
-        where d.del_flag = '0'
+        where d.del_flag = '0' and d.status = '0'
 		<if test="deptId != null and deptId != 0">
 			AND dept_id = #{deptId}
 		</if>

tool-tech-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
 			</if>
 			<!-- 锁定某些字段类型 -->
-			AND dict_type in ('tool_type','msg_status','tool_source','tool_status','doc_class','doc_source','doc_upload_status','flow_status')
+			AND dict_type in ('tool_type','msg_status','tool_source','tool_status','doc_class','doc_source','doc_upload_status')
 		</where>
 	</select>