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 ae393e5..3ed10ae 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 @@ -37,6 +37,11 @@ public class ToDoBean extends BaseEntity { @ApiModelProperty(value = "任务类型") private String taskType; + /** 任务状态 */ + @Excel(name = "任务状态") + @ApiModelProperty(value = "任务状态") + private String taskStatus; + /** 代办事件 */ @Excel(name = "代办事件") @ApiModelProperty(value = "代办事件") 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 48bcb63..5feac70 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 @@ -23,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE tt.`status` = '1' and tt.task_type in (2) - and tt.task_status in (1,2,3,4,5,10,15,20,99) and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId}