From 48eb5dc61ac07d232632b13d040006128ed5cceb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 20:59:23 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index 192128f..96a19e8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,6 +11,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -83,13 +86,18 @@
@ExcelColumn(name="鎵瑰崟鐢熸晥鏃堕棿")
private Date applyStartTime;
- @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
- @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� 4骞冲彴鍚屾剰 5骞冲彴椹冲洖")
+ @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�) 5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
+ @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�) 5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
private Integer status;
+
@ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
private String signApplyNo;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
+ //鍏ュ弬
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ //鍑哄弬
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date validTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -144,6 +152,19 @@
@ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
@TableField(exist = false)
private Integer solutionsId;
+ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭(鍩鸿〃锛�")
+ @TableField(exist = false)
+ private Integer baseSolutionsId;
+ @ApiModelProperty(value = "鐢宠鍗曢檮浠�")
+ @TableField(exist = false)
+ private Multifile applyFile;
+ @ApiModelProperty(value = "鐢宠鍗曟崲鍘傞檮浠�")
+ @TableField(exist = false)
+ private Multifile applyUnitFile;
+ @ApiModelProperty(value = "鎵瑰崟闄勪欢")
+ @TableField(exist = false)
+ private Multifile pidanFile;
+
@ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
@TableField(exist = false)
@@ -162,9 +183,6 @@
@TableField(exist = false)
private Integer companyId;
- @ApiModelProperty(value = "鎵瑰崟闄勪欢瀵硅薄")
- @TableField(exist = false)
- private Multifile pidanFile;
@ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵�� 0鍚屾剰 1椹冲洖")
@TableField(exist = false)
private int dealBackApply;
@@ -176,5 +194,19 @@
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "鏃ュ織璁板綍")
+ @TableField(exist = false)
+ private List<ApplyLog> applyLogList;
+ public TaxesInvoicingVO toTaxesInvoicingVO(){
+ TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
+ taxesInvoicingVO.setId(this.getId());
+ taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
+ taxesInvoicingVO.setValidCode(this.getValidCode());
+ taxesInvoicingVO.setAddNum(this.getAddNum());
+ taxesInvoicingVO.setDelNum(this.getDelNum());
+ taxesInvoicingVO.setAmount(this.getFee());
+ taxesInvoicingVO.setType(Constants.ONE);
+ return taxesInvoicingVO;
+ }
}
--
Gitblit v1.9.3