Browse Source

问题处理

yzc 1 year ago
parent
commit
7ad40acfc3

+ 4 - 1
hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControl.java

@@ -1,12 +1,14 @@
 package com.fjhx.account.entity.cost.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fjhx.common.controller.Label;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -42,7 +44,8 @@ public class CostControl extends BasePo {
      * 申请时间
      */
     @Label("申请时间")
-    private String applyTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date applyTime;
 
     /**
      * 流水号

+ 1 - 1
hx-account/src/main/java/com/fjhx/account/service/cost/impl/CostControlServiceImpl.java

@@ -151,7 +151,7 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
             //保存非发票附件
             ObsFileUtil.editFile(costControlDetailDto.getFileList(), costControlDetailDto.getId(), 0);
             //保存发票附件
-            ObsFileUtil.editFile(costControlDetailDto.getFileList(), costControlDetailDto.getId(), 10);
+            ObsFileUtil.editFile(costControlDetailDto.getInvoiceFileList(), costControlDetailDto.getId(), 10);
         }
     }