转账记录导出新增申请时间、交易时间

src/main/java/com/ydtech/modules/inv/model/InvAccountOperate.java

@@ -39,9 +39,9 @@ public class InvAccountOperate implements Serializable {
     private String accountOperateId;
 
 
-    @ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "交易时间")
 //    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ExcelProperty("支出时间")
+    @ExcelProperty("交易时间")
     @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
     private String createTime;
 
@@ -68,6 +68,7 @@ public class InvAccountOperate implements Serializable {
      * 申请时间
      */
     @ApiModelProperty(value = "申请时间")
+    @ExcelProperty("申请时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date applyTime;
 

src/main/java/com/ydtech/modules/inv/utils/EasyExcelUtils.java

@@ -130,23 +130,25 @@ public class EasyExcelUtils {
     private static List<List<String>> operateHead(List<InvAccountProfit> invAccountProfitList) {
         List<List<String>> list = new ArrayList<>(7 + invAccountProfitList.size());
         List<String> head = ListUtils.newArrayList();
-        head.add("支出时间");
+        head.add("申请时间");
         List<String> head1 = ListUtils.newArrayList();
-        head1.add("部门");
+        head1.add("交易时间");
         List<String> head2 = ListUtils.newArrayList();
-        head2.add("支出方");
+        head2.add("部门");
         List<String> head3 = ListUtils.newArrayList();
-        head3.add("收入方");
+        head3.add("支出方");
         List<String> head4 = ListUtils.newArrayList();
-        head4.add("支出项目");
+        head4.add("收入方");
         List<String> head5 = ListUtils.newArrayList();
-        head5.add("分项");
+        head5.add("支出项目");
         List<String> head6 = ListUtils.newArrayList();
-        head6.add("支出金额");
+        head6.add("分项");
         List<String> head7 = ListUtils.newArrayList();
-        head7.add("转账类型");
+        head7.add("支出金额");
         List<String> head8 = ListUtils.newArrayList();
-        head8.add("备注");
+        head8.add("转账类型");
+        List<String> head9 = ListUtils.newArrayList();
+        head9.add("备注");
 
         list.add(0, head);
         list.add(1, head1);
@@ -157,6 +159,7 @@ public class EasyExcelUtils {
         list.add(6, head6);
         list.add(7, head7);
         list.add(8, head8);
+        list.add(9, head9);
         invAccountProfitList.forEach(invAccountProfit -> {
             List<String> head0 = ListUtils.newArrayList();
             head0.add(invAccountProfit.getProfitName());
@@ -171,6 +174,7 @@ public class EasyExcelUtils {
         List<List<Object>> list = ListUtils.newArrayList();
         invAccountOperates.forEach(invAccountOperate -> {
             List<Object> data = ListUtils.newArrayList();
+            data.add(invAccountOperate.getApplyTime());
             data.add(invAccountOperate.getCreateTime());
             data.add(invAccountOperate.getApplySector());
             data.add(invAccountOperate.getFundFlow().substring(0, invAccountOperate.getFundFlow().indexOf("→")));

src/main/resources/mapper/modules/inv/InvAccountOperateMapper.xml

@@ -111,6 +111,9 @@
         <if test="insAccountOperate.createTime != null and insAccountOperate.createTime != ''">
             and create_time like concat('%',#{insAccountOperate.createTime},'%')
         </if>
+        <if test="insAccountOperate.applyTime != null and insAccountOperate.applyTime != ''">
+            and applyTime like concat('%',#{insAccountOperate.applyTime},'%')
+        </if>
         order by create_time
         desc
     </select>