From bc090b07e4310ee33a28a907dbf2cd542facc768 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 09:55:44 +0800
Subject: [PATCH] 字段补充
---
business/src/main/java/com/ycl/domain/form/ProjectInfoWinUnitForm.java | 18 +++++++++++-------
business/src/main/java/com/ycl/domain/form/ProjectInfoYearPlanForm.java | 10 +++-------
business/src/main/resources/mapper/ProjectInfoWinUnitMapper.xml | 5 +++++
business/src/main/java/com/ycl/domain/entity/ProjectInfoWinUnit.java | 7 +++++++
business/src/main/java/com/ycl/domain/vo/ProjectInfoWinUnitVO.java | 16 ++++++++++++----
5 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfoWinUnit.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfoWinUnit.java
index 395e96e..e0f660b 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfoWinUnit.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfoWinUnit.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.util.Date;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
@@ -35,5 +36,11 @@
/** 鑱旂郴鏂瑰紡 */
private String phone;
+ @TableField("win_amount")
+ /** 涓爣閲戦 */
+ private String winAmount;
+ @TableField("win_time")
+ /** 涓爣鏃堕棿 */
+ private Date winTime;
}
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoWinUnitForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoWinUnitForm.java
index de77074..d7a3487 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoWinUnitForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoWinUnitForm.java
@@ -23,22 +23,26 @@
@ApiModel(value = "ProjectInfoWinUnit琛ㄥ崟", description = "椤圭洰涓爣鍗曚綅琛ㄥ崟")
public class ProjectInfoWinUnitForm extends AbsForm {
- @NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("椤圭洰id")
- private Long projectInfoId;
-
- @NotBlank(message = "涓爣鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotBlank(message = "涓爣鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓爣鍗曚綅")
private String winUnit;
- @NotBlank(message = "鑱旂郴浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
+// @NotBlank(message = "鑱旂郴浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鑱旂郴浜�")
private String contacts;
- @NotBlank(message = "鑱旂郴鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotBlank(message = "鑱旂郴鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鑱旂郴鏂瑰紡")
private String phone;
+ @ApiModelProperty("涓爣閲戦")
+ /** 涓爣閲戦 */
+ private String winAmount;
+
+ @ApiModelProperty("涓爣鏃堕棿")
+ /** 涓爣鏃堕棿 */
+ private Date winTime;
+
public static ProjectInfoWinUnit getEntityByForm(@NonNull ProjectInfoWinUnitForm form, ProjectInfoWinUnit entity) {
if(entity == null) {
entity = new ProjectInfoWinUnit();
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoYearPlanForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoYearPlanForm.java
index 191da01..def0acf 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoYearPlanForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoYearPlanForm.java
@@ -25,19 +25,15 @@
@ApiModel(value = "ProjectInfoYearPlan琛ㄥ崟", description = "椤圭洰骞村害鎶曡祫璁″垝琛ㄥ崟")
public class ProjectInfoYearPlanForm extends AbsForm {
- @NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("椤圭洰id")
- private Long projectInfoId;
-
- @NotBlank(message = "骞翠唤涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotBlank(message = "骞翠唤涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("骞翠唤")
private String year;
- @NotNull(message = "骞村害鎶曡祫閲戦涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotNull(message = "骞村害鎶曡祫閲戦涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("骞村害鎶曡祫閲戦")
private BigDecimal yearTotalMoney;
- @NotBlank(message = "宸ョ▼褰㈣薄杩涘害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotBlank(message = "宸ョ▼褰㈣薄杩涘害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("宸ョ▼褰㈣薄杩涘害")
private String projectImageProgress;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoWinUnitVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoWinUnitVO.java
index bec0351..07665f7 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoWinUnitVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoWinUnitVO.java
@@ -1,13 +1,13 @@
package com.ycl.domain.vo;
-import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProjectInfoWinUnit;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
+import com.ycl.system.domain.base.AbsVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+
import java.util.Date;
/**
@@ -36,6 +36,14 @@
@ApiModelProperty("鑱旂郴鏂瑰紡")
private String phone;
+ @ApiModelProperty("涓爣閲戦")
+ /** 涓爣閲戦 */
+ private String winAmount;
+
+ @ApiModelProperty("涓爣鏃堕棿")
+ /** 涓爣鏃堕棿 */
+ private Date winTime;
+
public static ProjectInfoWinUnitVO getVoByEntity(@NonNull ProjectInfoWinUnit entity, ProjectInfoWinUnitVO vo) {
if(vo == null) {
vo = new ProjectInfoWinUnitVO();
diff --git a/business/src/main/resources/mapper/ProjectInfoWinUnitMapper.xml b/business/src/main/resources/mapper/ProjectInfoWinUnitMapper.xml
index c14da99..559adc5 100644
--- a/business/src/main/resources/mapper/ProjectInfoWinUnitMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoWinUnitMapper.xml
@@ -8,6 +8,8 @@
<result column="win_unit" property="winUnit" />
<result column="contacts" property="contacts" />
<result column="phone" property="phone" />
+ <result column="win_time" property="winTime" />
+ <result column="win_amount" property="winAmount" />
</resultMap>
@@ -19,6 +21,9 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
TPIWU.project_info_id,
+ TPIWU.win_time,
+ TPIWU.win_amount,
+ TPIWU.project_info_id,
TPIWU.win_unit,
TPIWU.contacts,
TPIWU.phone,
--
Gitblit v1.8.0