From 66a66111e343492a0832e18f5b4d238c70274eef Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 11 May 2024 17:34:14 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/property/vo/PropertyCapitalApplyVO.java | 15 +++++++
src/main/java/org/springblade/modules/property/vo/ExpenseDetails.java | 32 ++++++++++++++++
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 7 ++-
src/main/java/org/springblade/flow/core/entity/BladeFlow.java | 7 +++
4 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/flow/core/entity/BladeFlow.java b/src/main/java/org/springblade/flow/core/entity/BladeFlow.java
index 8d65b24..9cd880f 100644
--- a/src/main/java/org/springblade/flow/core/entity/BladeFlow.java
+++ b/src/main/java/org/springblade/flow/core/entity/BladeFlow.java
@@ -46,12 +46,14 @@
/**
* 开始时间
*/
+ @ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTimes;
/**
* 结束时间
*/
+ @ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTimes;
@@ -85,6 +87,7 @@
/**
* 任务执行人名称
*/
+ @ApiModelProperty(value = "任务执行人名称")
private String assigneeName;
/**
* 流程分类
@@ -97,6 +100,7 @@
/**
* 创建时间
*/
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 结束时间
@@ -161,10 +165,12 @@
/**
* 历史活动流程
*/
+ @ApiModelProperty(value = "历史活动流程")
private String historyActivityName;
/**
* 历史活动耗时
*/
+ @ApiModelProperty(value = "历史活动耗时")
private String historyActivityDurationTime;
/**
* 业务绑定Table
@@ -181,6 +187,7 @@
/**
* 任务意见
*/
+ @ApiModelProperty(value = "任务意见")
private String comment;
/**
* 是否通过
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index f1c7ec1..0a3fd99 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -76,7 +76,7 @@
/**
* 分摊方式
*/
- @ApiModelProperty(value = "分摊方式")
+ @ApiModelProperty(value = "分摊方式:按照面积分摊")
private String allocationWay;
/**
* 预算总金额
@@ -200,11 +200,12 @@
@ApiModelProperty("申请状态 0：待审核 1：业委会审核 2：街道审核 3：住建局审核 4：调整申请 5：审核通过 6：审核不通过 7:上饶住建局")
private Integer applyStatus;
+ @ApiModelProperty("任务id")
private String taskId;
-
+ @ApiModelProperty("文章id")
private Integer articleId;
- @ApiModelProperty(value = "附件")
+ @ApiModelProperty(value = "附件 [{fileName:'',fileType:'zip',fileUrl:'https://www.****.com'}]")
private String attachment;
/**
diff --git a/src/main/java/org/springblade/modules/property/vo/ExpenseDetails.java b/src/main/java/org/springblade/modules/property/vo/ExpenseDetails.java
new file mode 100644
index 0000000..94c0835
--- /dev/null
+++ b/src/main/java/org/springblade/modules/property/vo/ExpenseDetails.java
@@ -0,0 +1,32 @@
+package org.springblade.modules.property.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ExpenseDetails {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("业主名称")
+ private String name;
+
+ @ApiModelProperty("房屋号")
+ private String houseName;
+
+ @ApiModelProperty("维修基金金额")
+ private Double maintenanceFundAmount;
+
+ @ApiModelProperty("分摊金额")
+ private Double allocationAmount;
+
+ @ApiModelProperty("支付金额")
+ private Double payment;
+
+ @ApiModelProperty("维修基金余额")
+ private Double maintenanceFundBalance;
+
+
+
+
+
+}
diff --git a/src/main/java/org/springblade/modules/property/vo/PropertyCapitalApplyVO.java b/src/main/java/org/springblade/modules/property/vo/PropertyCapitalApplyVO.java
index a757c22..d0983f5 100644
--- a/src/main/java/org/springblade/modules/property/vo/PropertyCapitalApplyVO.java
+++ b/src/main/java/org/springblade/modules/property/vo/PropertyCapitalApplyVO.java
@@ -17,10 +17,13 @@
package org.springblade.modules.property.vo;
import io.swagger.annotations.ApiModelProperty;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.property.entity.PropertyCompanyEntity;
import java.util.List;
@@ -35,6 +38,18 @@
public class PropertyCapitalApplyVO extends PropertyCapitalApplyEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("物业公司")
+ private PropertyCompanyEntity propertyCompany;
+
+ @ApiModelProperty("业主信息集合")
+ private List<HouseholdEntity> householdList;
+
+ @ApiModelProperty("审核流程信息集合")
+ private List<BladeFlow> flowList;
+
+ @ApiModelProperty("支出明细集合")
+ private List<ExpenseDetails> AllocationDetailsList;
+
@ApiModelProperty("物业：0无 1有")
private Integer propertyFlag;
--
Gitblit v1.9.3