diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java index c891f71..0e84590 100644 --- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java +++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java @@ -103,7 +103,7 @@ public class ToolController extends BaseController @Log(title = "工具信息", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('tool:list')") @PostMapping("/export/word/list") - public AjaxResult exportWordList(Tool tool) + public AjaxResult exportWordList(@RequestBody Tool tool) { List list = toolService.selectAllList(tool); return AjaxResult.success(list); diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java index a025295..d8e7522 100644 --- a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java +++ b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java @@ -24,36 +24,37 @@ public class Tool extends BaseEntity private String toolId; /** 工具编号 */ + @Excel(name = "编号",sort=1) private String toolCode; /** 工具名称 */ - @Excel(name = "工具名称",sort=1) + @Excel(name = "中文别名",sort=2) private String toolName; /** 工具类别 */ - @Excel(name = "工具类别",dictType="tool_type",sort=2) + @Excel(name = "类别",dictType="tool_type",sort=5) private String toolType; /** 来源 */ - @Excel(name = "工具来源",dictType="tool_source",sort=3) + @Excel(name = "来源",dictType="tool_source",sort=3) private String toolSource; private String toolSourceName; /** 用途 */ - //@Excel(name = "工具用途",sort=7) + @Excel(name = "用途",sort=6) private String toolUse; /** 测试情况 */ - //@Excel(name = "测评情况",sort=8) + @Excel(name = "测评机构",sort=7) private String testSituation; /** 功能描述 */ - //@Excel(name = "功能描述",sort=9) + @Excel(name = "功能简介",sort=8) private String functionDesc; /** 适用条件 */ - //@Excel(name = "适用条件",sort=10) + @Excel(name = "适用条件",sort=9) private String applyCondition; /** 操作说明 */ @@ -70,15 +71,27 @@ public class Tool extends BaseEntity /** 归属单位 */ private String toolRespDept; - @Excel(name = "归属单位",sort=5) + @Excel(name = "归属单位",sort=12) private String toolRespDeptName; + @Excel(name = "加密方式",sort=10) + private String encryptionMode; + + @Excel(name = "服务时间",sort=11) + private String serviceTime; + + @Excel(name = "联系人",sort=13) + private String contactPerson; + + @Excel(name = "联系方式",sort=14) + private String contactPhone; + /** 状态 */ - @Excel(name = "状态",dictType="tool_status",sort=6) + @Excel(name = "形态",dictType="tool_status",sort=4) private String status; /** 备注 */ - //@Excel(name = "备注",sort=12) + @Excel(name = "备注",sort=15) private String remark; /** 关联工具 */ @@ -87,12 +100,11 @@ 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") + @Excel(name = "创建时间", dateFormat="yyyy-MM-dd",sort=16) private Date createTime; private Boolean editStatus; diff --git a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml index 143b10a..d6043a4 100644 --- a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml +++ b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml @@ -19,6 +19,10 @@ + + + + @@ -40,7 +44,7 @@ - select tool_id, tool_code, tool_name, tool_type, tool_source, tool_use, test_situation, function_desc, apply_condition, operate_explain, tool_principals, tool_principals_name, tool_resp_dept, status, remark, create_by, create_time, update_by, update_time,proc_inst_id,record_status,association from t_tool + select tool_id, tool_code, tool_name, tool_type, tool_source, tool_use, test_situation, function_desc, apply_condition, operate_explain, tool_principals, tool_principals_name, tool_resp_dept, encryption_mode, service_time, contact_person, contact_phone, status, remark, create_by, create_time, update_by, update_time,proc_inst_id,record_status,association from t_tool