From 6803fe878c7d82cafafca641d7f214da5c64cca3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 29 五月 2024 19:15:04 +0800
Subject: [PATCH] 回访-测2024-05-29
---
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java | 2 +
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java | 30 +++++++++++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java | 26 +++++++++---
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 22 -----------
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java | 4 ++
5 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java
new file mode 100644
index 0000000..0a69967
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemProjectVo.java
@@ -0,0 +1,30 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+
+/**鍥炶鍒楄〃瀛愰」鏁版嵁
+ * @author CJH
+ */
+@Data
+public class ReturnVisitListItemProjectVo {
+
+ /*** 鏍囪瘑 */
+ private String id;
+ /*** 椤圭洰鏍囪瘑 */
+ private String projectId;
+ /*** 椤圭洰鏍囪瘑 */
+ private String projectName;
+
+
+ public ReturnVisitListItemProjectVo() {
+
+ }
+
+ public ReturnVisitListItemProjectVo(String id, String projectId, String projectName) {
+ this.id = id;
+ this.projectId = projectId;
+ this.projectName = projectName;
+ }
+}
+
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
index 881a114..9e1e718 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
@@ -1,9 +1,10 @@
package com.hz.phis.vo.returnVisitRecord;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.hx.util.MapUtil;
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@@ -17,32 +18,43 @@
private Integer timeoutStatus;
/*** 鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�**/
private Integer returnVisitStatus;
+
/*** 闂ㄥ簵ID */
private String shopId;
/*** 闂ㄥ簵鍚嶇О */
private String shopName;
+
/*** 鍥炶绫诲瀷 瀛楀吀id */
private String returnVisitType;
/*** 鍥炶绫诲瀷鍚嶇О*/
private String returnVisitTypeName;
+
+ /**鍥炶鏂瑰紡 瀛楀吀id*/
+ private String returnVisitMethod;
+ /**鍥炶鏂瑰紡鍚嶇О*/
+ private String returnVisitMethodName;
+
/*** 鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触**/
private Integer visitResultStatus;
/*** 鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�**/
private Integer satisfiedStatus;
+
/*** 鍥炶浜哄悕绉�**/
- private String operationName;
+ private String corpName;
/*** 鍥炶浜篿d**/
- private String operationId;
+ private String corpId;
+
/*** 鍥炶璇︽儏**/
private String content;
/*** 鍥炶澶囨敞**/
private String remark;
/*** 鍥炶璁板綍鏍囪瘑 **/
private String id;
- //鍒涘缓浜�
+
+ /**鍒涘缓浜�*/
private String createPersonName;
-
+ private List<ReturnVisitListItemProjectVo> projectList = new ArrayList<>();
public ReturnVisitListItemVo() {
}
@@ -57,8 +69,8 @@
this.returnVisitTypeName = MapUtil.getString(visitRecord,"returnVisitTypeName");
this.visitResultStatus = MapUtil.getInt(visitRecord,"visitResultStatus");
this.satisfiedStatus = MapUtil.getInt(visitRecord,"satisfiedStatus");
- this.operationName = MapUtil.getString(visitRecord,"operationName");
- this.operationId = MapUtil.getString(visitRecord,"operationId");;
+ this.corpName = MapUtil.getString(visitRecord,"corpName");
+ this.corpId = MapUtil.getString(visitRecord,"corpId");;
this.content = MapUtil.getString(visitRecord,"content");
this.remark = MapUtil.getString(visitRecord,"remark");
this.createPersonName = MapUtil.getString(visitRecord,"createPersonName");;
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
index f740762..477e141 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
@@ -60,32 +60,10 @@
//--- 鍙栧�肩涓�涓� todo
- /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� id*/
- private Set<String> ids = new HashSet<>();
- /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖*/
- private Set<String> shopIds = new HashSet<>();
- /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
- private Set<String> shopNames = new HashSet<>();
- /**鍥炶绫诲瀷 瀛楀吀id"*/
- private Set<String> returnVisitTypes = new HashSet<>();
- /**鍥炶绫诲瀷鍚嶇О*/
- private Set<String> returnVisitTypeNames = new HashSet<>();
-
- /**鍥炶鏂瑰紡 瀛楀吀id*/
- private Set<String> returnVisitMethods = new HashSet<>();
- /**鍥炶鏂瑰紡鍚嶇О*/
- private Set<String> returnVisitMethodNames = new HashSet<>();
-
- /**鍒涘缓浜�*/
- private Set<String> createPersonNames = new HashSet<>();
-
/**鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
private String situation;
/**鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
private String visitRemark;
-
- /**鍥炶椤圭洰*/
- private List<String> projectList;
/*** 鍥炶鍒楄〃瀛愭暟鎹�**/
private List<ReturnVisitListItemVo> itemList = new ArrayList<>();
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
index 82d9aee..dd0489a 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
@@ -50,6 +50,8 @@
/*** 鐗规畩瀛楁 淇敼浼犲�� 鍥炶鍐呭 澶氫釜**/
private List<ReturnVisitRecordInfoVo> itemList;
+ /** 鍒犻櫎鐨勫洖璁�*/
+ private Set<String> deleteIdList;
/*********************************************/
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java
index 420213a..0aaa123 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java
@@ -11,12 +11,16 @@
@Data
public class ReturnVisitVisitVo {
+ /**鍥炶浜�*/
+ private String corpId;
/*** 鍥炶鏃ユ湡**/
private Date returnVisitTime;
/*** 鍥炶缁撴灉**/
private Integer visitResultStatus;
/*** 鍥炶鏄惁婊℃剰**/
private Integer satisfiedStatus;
+ /*** 鍥炶鏂瑰紡 **/
+ private String returnVisitMethod;
/*** 鍥炶璇︽儏锛堝憳宸ュ洖璁垮～鍐欙級**/
private String content;
/*** 鍥炶澶囨敞锛堝憳宸ュ垱寤哄洖璁垮～鍐欙級**/
--
Gitblit v1.8.0