diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java index 41956d4..194316a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java @@ -32,9 +32,9 @@ public class ToDoBean extends BaseEntity { */ private String taskTypeId; - /** 代办任务 */ - @Excel(name = "代办任务") - @ApiModelProperty(value = "代办任务") + /** 任务类型 */ + @Excel(name = "任务类型") + @ApiModelProperty(value = "任务类型") private String taskType; /** 代办事件 */ diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml index bfd285f..48bcb63 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml @@ -8,8 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT tt.task_id as taskId, tt.`code` as taskCode, - tt.task_type as taskTypeId, - sd2.dict_label as taskType, + tt.task_type as taskType, tt.task_status as taskStatus, tt.create_by as createBy, tt.create_time as createTime, @@ -19,12 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept2.dept_name as sellerCompanyName FROM tm_task tt - LEFT JOIN sys_dict_data sd2 on sd2.dict_value=tt.task_type LEFT JOIN sys_dept dept1 on dept1.dept_id=tt.buyer_company_id LEFT JOIN sys_dept dept2 on dept2.dept_id=tt.seller_company_id WHERE tt.`status` = '1' - and sd2.dict_type in ('tm_task_type') and tt.task_type in (2) and tt.task_status in (1,2,3,4,5,10,15,20,99)