ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、新增文档详情、评论，和导出word功能

Browse Source
This commit is contained in:
pan 2024-09-03 09:28:01 +08:00
parent aa5178ac92
commit e690285338
11 changed files with 122 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool-tech-admin/src/main/java/com/rzdata/web/controller/common/CommonController.java
View File

@ -191,6 +191,7 @@ public class CommonController
response.put("status", "200");
return ResponseEntity.ok(response);
} catch (IOException e) {
log.error("CommonController-->uploadChunk----e###", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
}
@ -222,6 +223,7 @@ public class CommonController
response.put("originalFilename", fileName);
return ResponseEntity.ok(response);
} catch (IOException e) {
log.error("CommonController-->uploadChunk----e###", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
} finally {
// 清理临时文件

8
tool-tech-admin/src/main/java/com/rzdata/web/controller/document/DocumentController.java
View File

@ -120,4 +120,12 @@ public class DocumentController extends BaseController
{
return AjaxResult.success(documentService.statistics());
}
@GetMapping("/all/list")
public AjaxResult allList(Document Document)
{
List<Document> list = documentService.selectAllList(Document);
return AjaxResult.success(list);
}
}

13
tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
View File

@ -97,6 +97,19 @@ public class ToolController extends BaseController
util.exportExcel(response, list, "工具信息数据",tTool.getExcludeFields());
}
/**
* 导出工具信息列表
*/
@Log(title = "工具信息", businessType = BusinessType.EXPORT)
@GetMapping("/export/word/list")
public AjaxResult exportWordList(Tool tool)
{
List<Tool> list = toolService.selectAllList(tool);
return AjaxResult.success(list);
}
/**
* 获取工具信息详细信息
*/

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

@ -104,4 +104,9 @@ public class Document extends BaseEntity {
private Boolean permissionCheck;
private Boolean permission;
private String docTypeName;
private String docSourceName;
private String statusName;
private String createNowTime;
}

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

@ -33,9 +33,11 @@ public class Tool extends BaseEntity
private String toolType;
/** 来源 */
@Excel(name = "工具来源",sort=3)
@Excel(name = "工具来源",dictType="tool_source",sort=3)
private String toolSource;
private String toolSourceName;
/** 用途 */
@Excel(name = "工具用途",sort=7)
private String toolUse;
@ -70,7 +72,7 @@ public class Tool extends BaseEntity
private String toolRespDeptName;
/** 状态 */
@Excel(name = "状态",dictType="sys_normal_disable",sort=6)
@Excel(name = "状态",dictType="tool_status",sort=6)
private String status;
/** 备注 */
@ -100,4 +102,10 @@ public class Tool extends BaseEntity
private List<String> excludeFields;
private List<Document> documentList;
/** 工具类型名称 **/
private String toolTypeName;
/** 状态名称 **/
private String statusName;
}

2
tool-tech-admin/src/main/java/com/rzdata/web/service/IDocumentService.java
View File

@ -77,4 +77,6 @@ public interface IDocumentService
public int batchDeleteById(List<String> docIds);
Map<String, Object> statistics();
List<Document> selectAllList(Document document);
}

2
tool-tech-admin/src/main/java/com/rzdata/web/service/IToolService.java
View File

@ -84,4 +84,6 @@ public interface IToolService
void sendTzMessage(Tool tTool);
Map<String, Object> statistics();
List<Tool> selectAllList(Tool tool);
}

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

@ -1,6 +1,7 @@
package com.rzdata.web.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@ -10,6 +11,7 @@ import com.rzdata.common.core.domain.entity.SysDictData;
import com.rzdata.common.core.domain.entity.SysUser;
import com.rzdata.common.utils.DateUtils;
import com.rzdata.common.utils.SecurityUtils;
import com.rzdata.system.service.ISysDeptService;
import com.rzdata.system.service.ISysDictTypeService;
import com.rzdata.web.domain.Attachment;
import com.rzdata.web.domain.Document;
@ -46,6 +48,10 @@ public class DocumentServiceImpl implements IDocumentService
@Autowired
private ISysDictTypeService sysDictTypeService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询【请填写功能名称】
*
@ -305,5 +311,40 @@ public class DocumentServiceImpl implements IDocumentService
}
}
}
@Override
public List<Document> selectAllList(Document document) {
List<Document> documents = documentMapper.selectDocumentList(document);
List<SysDictData> docClassList = sysDictTypeService.selectDictDataByType("doc_class");
List<SysDictData> docSourceList = sysDictTypeService.selectDictDataByType("doc_source");
List<SysDictData> docStatusList = sysDictTypeService.selectDictDataByType("doc_upload_status");
for (Document item : documents) {
for (SysDictData sysDictData : docClassList) {
if(sysDictData.getDictValue().equals(item.getDocType())){
item.setDocTypeName(sysDictData.getDictLabel());
break;
}
}
for (SysDictData sysDictData : docSourceList) {
if(sysDictData.getDictValue().equals(item.getDocSource())){
item.setDocSourceName(sysDictData.getDictLabel());
break;
}
}
for (SysDictData sysDictData : docStatusList) {
if(sysDictData.getDictValue().equals(item.getDocStatus())){
item.setStatusName(sysDictData.getDictLabel());
break;
}
}
if( StrUtil.isNotBlank(item.getDocRespDept())){
item.setDocRespDeptName(sysDeptService.getDeptName(item.getDocRespDept()));
}
item.setCreateNowTime(DateUtil.format(item.getCreateTime(), "yyyy-MM-dd hh:mm"));
}
return documents;
}
}

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

@ -339,4 +339,41 @@ public class ToolServiceImpl implements IToolService
}
}
}
@Override
public List<Tool> selectAllList(Tool tool) {
List<Tool> tools = toolMapper.selectToolList(tool);
List<SysDictData> toolSource = sysDictTypeService.selectDictDataByType("tool_source");
List<SysDictData> toolTypeList = sysDictTypeService.selectDictDataByType("tool_type");
List<SysDictData> toolStatus = sysDictTypeService.selectDictDataByType("tool_status");
for (Tool item : tools) {
for (SysDictData sysDictData : toolSource) {
if(sysDictData.getDictValue().equals(item.getToolSource())){
item.setToolSourceName(sysDictData.getDictLabel());
break;
}
}
for (SysDictData sysDictData : toolTypeList) {
if(sysDictData.getDictValue().equals(item.getToolType())){
item.setToolTypeName(sysDictData.getDictLabel());
break;
}
}
for (SysDictData sysDictData : toolStatus) {
if(sysDictData.getDictValue().equals(item.getStatus())){
item.setStatusName(sysDictData.getDictLabel());
break;
}
}
if( StrUtil.isNotBlank(tool.getToolRespDept())){
item.setToolRespDeptName(sysDeptService.getDeptName(tool.getToolRespDept()));
}
}
return tools;
}
}

2
tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml
View File

@ -24,6 +24,8 @@
<result property="toolId" column="tool_id" />
<result property="toolName" column="tool_name" />
<result property="docRespDeptName" column="doc_resp_dept_name" />
<result property="createById" column="create_by_id" />
<result property="updateById" column="update_by_id" />
</resultMap>
<sql id="selectDocumentVo">

1
tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
View File

@ -148,7 +148,6 @@
u.tool_principals, u.tool_principals_name, u.tool_resp_dept, u.status, u.create_by, u.create_time, u.remark, d.dept_name as tool_resp_dept_name,u.association
from t_tool u
left join sys_user su on u.create_by = su.user_id
-- left join sys_dept d on d.dept_id = su.dept_Id
left join sys_dept d on u.tool_resp_dept = d.dept_id
where 1=1
and u.record_status != 'cancel'