jihs 4 年之前
父節點
當前提交
ca898d79bd

+ 5 - 0
src/main/java/org/jeecg/common/dto/expense/ExpenseSlipRespDTO.java

@@ -41,6 +41,10 @@ public class ExpenseSlipRespDTO {
         private String proName;
         @ApiModelProperty("组织")
         private String pkOrg;
+         @ApiModelProperty("创建时间")
+         @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+         @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+         private Date createTime;
 
         private List<ExpenseSlipProjectListRespDTO> detailList;
 
@@ -59,5 +63,6 @@ public class ExpenseSlipRespDTO {
          this.proId = slip.getProId();
          this.proName = slip.getProName();
          this.pkOrg = slip.getPkOrg();
+         this.createTime = slip.getCreateTime();
      }
  }

+ 0 - 1
src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesMilestoneController.java

@@ -16,7 +16,6 @@ import org.jeecg.common.dto.basedata.ArchivesMilestoneListRespDTO;
 import org.jeecg.common.dto.basedata.ArchivesPostReqDTO;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.basedata.entity.BaseArchivesMilestone;
-import org.jeecg.modules.basedata.entity.FdContractClass;
 import org.jeecg.modules.basedata.service.IBaseArchivesMilestoneService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;

+ 0 - 1
src/main/java/org/jeecg/modules/basedata/entity/BaseArchivesCollectionLine.java

@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import javax.validation.constraints.NotEmpty;
 
 /**

+ 0 - 1
src/main/java/org/jeecg/modules/basedata/entity/BaseArchivesPost.java

@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import javax.validation.constraints.NotEmpty;
 
 @Data

+ 0 - 1
src/main/java/org/jeecg/modules/basedata/entity/BaseArchivesProjectApproval.java

@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 

+ 0 - 8
src/main/java/org/jeecg/modules/expense/controller/ReExpenseSlipController.java

@@ -1,14 +1,9 @@
 package org.jeecg.modules.expense.controller;
 
 import javax.servlet.http.HttpServletRequest;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.dto.expense.ExpenseSlipAddReqDTO;
@@ -22,7 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.expense.service.ReExpenseSlipService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,8 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-
 /**
    * @Author jihaosen
    * @date 2021/3/3

+ 0 - 1
src/main/java/org/jeecg/modules/payment/service/impl/ManagePaymentAndReceiptContentServiceImpl.java

@@ -4,7 +4,6 @@ import org.jeecg.modules.payment.entity.ManagePaymentAndReceiptContent;
 import org.jeecg.modules.payment.mapper.ManagePaymentAndReceiptContentMapper;
 import org.jeecg.modules.payment.service.ManagePaymentAndReceiptContentService;
 import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**