no message

src/main/java/cn/ezhizao/project/business/entrustExamine/controller/BizEntrustExamineController.java

@@ -81,9 +81,10 @@ public class BizEntrustExamineController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizEntrustExamine bizEntrustExamine) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizEntrustExamine);
+        bizEntrustExamine.setEntrustId(getTenantId());
         List<BizEntrustExamine> list = bizEntrustExamineService.getList(bizEntrustExamine);
         ExcelUtil<BizEntrustExamine> util = new ExcelUtil<BizEntrustExamine>(BizEntrustExamine.class);
-        util.exportExcel(response, list, "企业租户数据");
+        util.exportExcel(response, list, "取消委托数据");
     }
 
     /**

src/main/java/cn/ezhizao/project/business/entrustExamine/domain/BizEntrustExamine.java

@@ -36,29 +36,27 @@ public class BizEntrustExamine extends BaseEntity {
     /**
      * 所属期
      */
-    @Excel(name = "所属期")
-    @ApiModelProperty(value = "所属期")
+    @Excel(name = "所属期",sort = 4)
     private String currentPeriod;
 
     /**
      * 委托来源
      */
-    @Excel(name = "委托来源")
     @ApiModelProperty(value = "委托来源")
+    @Excel(name = "委托来源",sort = 5)
     private Long entrustCome;
 
     /**
      * 取消理由
      */
-    @Excel(name = "取消理由")
     @ApiModelProperty(value = "取消理由")
+    @Excel(name = "取消理由",sort = 6)
     private String cancelReason;
 
     /**
      * 1同意 2拒绝
      */
-    @Excel(name = "1同意 2拒绝")
-    @ApiModelProperty(value = "1同意 2拒绝")
+    @Excel(name = "状态",sort = 7,readConverterExp = "0=待确认,1=已同意,2=已拒绝")
     private Integer status;
 
     /**
@@ -79,19 +77,26 @@ public class BizEntrustExamine extends BaseEntity {
     private String fromTenant;
 
     @TableField(exist = false)
+    @Excel(name = "税号",sort = 2)
     private String socialCreditCode;
 
     @TableField(exist = false)
+    @Excel(name = "项目",sort = 3)
     private String taskName;
 
     @TableField(exist = false)
+    @Excel(name = "客户名称",sort = 1)
     private String companyName;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
+    @Excel(name = "提交时间",sort = 5,dateFormat = "yyyy-MM-dd HH:mm")
     private java.util.Date createTime;
 
     private Integer nextFlag;
     @TableField(exist = false)
     private List<String> dateFilter;
+
+    @TableField(exist = false)
+    private String entrustComeName;
 }

src/main/resources/mybatis/business/BizEntrustExamineMapper.xml

@@ -30,8 +30,9 @@
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t1.entrust_id = #{entrustId}
             <if test="currentPeriod != null  and currentPeriod != ''">AND t1.current_period LIKE CONCAT('%',#{currentPeriod},'%')</if>
-            <if test="entrustCome != null  and entrustCome != ''">AND t1.entrust_come LIKE CONCAT('%',#{entrustCome},'%') </if>
+            <if test="entrustComeName != null  and entrustComeName != ''">AND t4..account_name LIKE CONCAT('%',#{entrustComeName},'%') </if>
             <if test="status != null ">AND t1.status = #{status}</if>
+            <if test="companyName!= null and companyName != ''">AND t2.NAME LIKE CONCAT('%',#{companyName},'%')</if>
             <if test="dateFilter!= null and dateFilter.size() ">
                 AND (
                 DATE_FORMAT(t1.create_time,'%Y-%m-%d') &gt;= #{dateFilter[0]}