From 9c674c5b5738027f790b413a1c09b7051ec2a059 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 27 五月 2024 18:28:28 +0800
Subject: [PATCH] Merge branch 'chenjiahe-新版回访' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java | 86 +++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java | 66 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java | 23 ++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java | 59 ++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java | 17 +
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java | 67 +++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 141 +++++++++++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java | 38 ++++
8 files changed, 497 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java
new file mode 100644
index 0000000..6fc0ba4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordFindVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user-return-visit-record")
+public interface SReturnVisitRecordService {
+
+
+ /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍鍒楄〃 **/
+ @PostMapping(value = "/return/visit/record/list")
+ Result returnVisitList(@RequestBody ReturnVisitRecordFindVo findData);
+
+ /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍璇︽儏 **/
+ @PostMapping(value = "/return/visit/record/detail")
+ Result returnVisitDetail(@RequestBody ReturnVisitRecordFindVo findData);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java
new file mode 100644
index 0000000..d6a7a46
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java
@@ -0,0 +1,66 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordInsertVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-return-visit-record")
+public interface SPhipReturnVisitRecordService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鍥炶璁板綍鏂板
+ */
+ @PostMapping(value = "/return/visit/record/v2/add")
+ Result add(@RequestBody ReturnVisitRecordInsertVo dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍥炶璁板綍淇敼
+ */
+ @PostMapping(value = "/return/visit/record/v2/update")
+ Result update(@RequestBody ReturnVisitRecordInsertVo dto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-鎵归噺淇敼鍥炶浜�
+ */
+ @PostMapping(value = "/return/visit/record/v2/batch/update/corp/user")
+ Result batchUpdateCorpUser(@RequestBody ReturnVisitRecordInsertVo dto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-鎵归噺淇敼璁″垝鏃堕棿
+ */
+ @PostMapping(value = "/return/visit/record/v2/batch/update/plan/time")
+ Result batchUpdatePlanTime(@RequestBody ReturnVisitRecordInsertVo dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍙栨秷
+ */
+ @PostMapping(value = "/return/visit/record/v2/cancel")
+ Result cancelData(@RequestBody ReturnVisitRecordInsertVo dto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-鎵归噺鍙栨秷
+ */
+ @PostMapping(value = "/return/visit/record/v2/batch/cancel")
+ Result batchCancelData(@RequestBody ReturnVisitRecordInsertVo dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍒犻櫎
+ */
+ @PostMapping(value = "/return/visit/record/v2/delete")
+ Result delete(@RequestBody ReturnVisitRecordInsertVo dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍥炶
+ */
+ @PostMapping(value = "/return/visit/record/v2/access")
+ Result access(@RequestBody ReturnVisitRecordInsertVo dto);
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..881a114
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
@@ -0,0 +1,67 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.hx.util.MapUtil;
+import lombok.Data;
+
+import java.util.Map;
+
+
+/**鍥炶鍒楄〃瀛愰」鏁版嵁
+ * @author CJH
+ */
+@Data
+public class ReturnVisitListItemVo {
+
+ /*** 瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�**/
+ private Integer timeoutStatus;
+ /*** 鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�**/
+ private Integer returnVisitStatus;
+ /*** 闂ㄥ簵ID */
+ private String shopId;
+ /*** 闂ㄥ簵鍚嶇О */
+ private String shopName;
+ /*** 鍥炶绫诲瀷 瀛楀吀id */
+ private String returnVisitType;
+ /*** 鍥炶绫诲瀷鍚嶇О*/
+ private String returnVisitTypeName;
+ /*** 鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触**/
+ private Integer visitResultStatus;
+ /*** 鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�**/
+ private Integer satisfiedStatus;
+ /*** 鍥炶浜哄悕绉�**/
+ private String operationName;
+ /*** 鍥炶浜篿d**/
+ private String operationId;
+ /*** 鍥炶璇︽儏**/
+ private String content;
+ /*** 鍥炶澶囨敞**/
+ private String remark;
+ /*** 鍥炶璁板綍鏍囪瘑 **/
+ private String id;
+ //鍒涘缓浜�
+ private String createPersonName;
+
+
+
+ public ReturnVisitListItemVo() {
+ }
+
+ public ReturnVisitListItemVo(Map<String,Object> visitRecord) {
+ this.id = visitRecord.get("id").toString();
+ this.timeoutStatus = MapUtil.getInt(visitRecord,"timeoutStatus");
+ this.returnVisitStatus = MapUtil.getInt(visitRecord,"returnVisitStatus");
+ this.shopId = MapUtil.getString(visitRecord,"shopId");
+ this.shopName = MapUtil.getString(visitRecord,"shopName");
+ this.returnVisitType = MapUtil.getString(visitRecord,"returnVisitType");
+ 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.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
new file mode 100644
index 0000000..f740762
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
@@ -0,0 +1,141 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.hx.util.DateUtil;
+import com.hx.util.MapUtil;
+import lombok.Data;
+
+import java.util.*;
+
+/**
+ * 鍥炶鍒楄〃杩斿洖dto
+ * @author CJH
+ */
+@Data
+public class ReturnVisitListVo {
+
+ /**鐢ㄦ埛id*/
+ private String userId;
+ /**鐢ㄦ埛鍚嶇О*/
+ private String userName;
+ /**鍛樺伐鏍囪瘑*/
+ private String corpId;
+ /**鍛樺伐鍚嶇О*/
+ private String corpName;
+
+ /**璁″垝鏃ユ湡*/
+ private Date planTime;
+ /**鍥炶鏃堕棿*/
+ private Date returnVisitTime;
+ /**瀹屾垚鏃堕棿*/
+ private Date doneTime;
+
+ /**鐢ㄦ埛鐢熸棩*/
+ private String birthDay;
+ /**CIQ*/
+ private String CIQ;
+ /**浼氬憳鍙�*/
+ private String memberNO;
+ /**鎵嬫満鍙�*/
+ private String tel;
+
+ /**娓犻亾鏉ユ簮*/
+ private String channelType;
+ /**娓犻亾鏉ユ簮*/
+ private String channelType2;
+ /**椤鹃棶鍚嶇О*/
+ private String cnName;
+
+ // --- 鍙栧�肩涓�涓� todo
+ /**鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�*/
+ private Integer returnVisitStatus;
+ /**瀹屾垚鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�*/
+ private Integer doneStatus;
+ /**瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�*/
+ private Integer timeoutStatus;
+ /**鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触*/
+ private Integer visitResultStatus;
+ /**鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�*/
+ private Integer satisfiedStatus;
+
+ //--- 鍙栧�肩涓�涓� 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<>();
+
+
+ //---鏌ヨ棰濆杩斿洖鐨勫弬鏁�
+ /**id*/
+ private String id;
+ /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖*/
+ private String shopId ;
+ /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
+ private String shopName ;
+ /**鍥炶绫诲瀷 瀛楀吀id"*/
+ private String returnVisitType;
+ /**鍥炶绫诲瀷鍚嶇О*/
+ private String returnVisitTypeName;
+
+ /**鍥炶鏂瑰紡 瀛楀吀id*/
+ private String returnVisitMethod ;
+ /**鍥炶鏂瑰紡鍚嶇О*/
+ private String returnVisitMethodName;
+ /**鍒涘缓浜�*/
+ private String createPersonName;
+
+
+ public ReturnVisitListVo() {
+ }
+
+ public ReturnVisitListVo(Map<String,Object> recordMap) {
+ this.userId = MapUtil.getString(recordMap,"userId");
+ this.userName = MapUtil.getString(recordMap,"userName");
+ this.corpId = MapUtil.getString(recordMap,"corpId");
+ this.corpName = MapUtil.getString(recordMap,"corpName");
+ this.planTime = DateUtil.parseString_2(recordMap.get("planTime").toString());
+ this.returnVisitTime = DateUtil.parseString_1(MapUtil.getString(recordMap,"returnVisitTime"));
+ this.doneTime = DateUtil.parseString_1(MapUtil.getString(recordMap,"doneTime"));
+ this.birthDay = MapUtil.getString(recordMap,"birthDay");
+ this.CIQ = MapUtil.getString(recordMap,"CIQ");
+ this.memberNO = MapUtil.getString(recordMap,"memberNO");
+ this.tel = MapUtil.getString(recordMap,"tel");
+ this.channelType = MapUtil.getString(recordMap,"channelType");
+ this.channelType2 = MapUtil.getString(recordMap,"channelType2");
+ this.cnName = MapUtil.getString(recordMap,"cnName");
+ this.returnVisitStatus = MapUtil.getInt(recordMap,"returnVisitStatus");
+ this.doneStatus = MapUtil.getInt(recordMap,"doneStatus");
+ this.timeoutStatus = MapUtil.getInt(recordMap,"timeoutStatus");
+ this.visitResultStatus = MapUtil.getInt(recordMap,"visitResultStatus");
+ this.satisfiedStatus = MapUtil.getInt(recordMap,"satisfiedStatus");
+ this.situation = MapUtil.getString(recordMap,"situation");
+ this.visitRemark = MapUtil.getString(recordMap,"visitRemark");
+ }
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
new file mode 100644
index 0000000..a4ad989
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
@@ -0,0 +1,86 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**鍥炶鏌ヨ鏉′欢瀵硅薄
+ * @author CJH*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ReturnVisitRecordFindVo extends PageDto {
+
+ /*** 鎵�灞炵敤鎴�**/
+ private String userId;
+ /*** 璁″垝鏃堕棿-寮�濮�**/
+ private Date planStartTime;
+ /*** 璁″垝鏃堕棿-缁撴潫**/
+ private Date planEndTime;
+ /*** 鍥炶鐘舵��**/
+ private Integer returnVisitStatus;
+ /*** 瀹屾垚鐘舵��**/
+ private Integer doneStatus;
+ /*** 瓒呮椂鐘舵��**/
+ private Integer timeoutStatus;
+
+ //---棰濆鐨勫弬鏁�
+ /*** 璁″垝鏃堕棿**/
+ private Date planTime;
+ /***鍛樺伐ID - List**/
+ private List<String> employeeIds;
+
+ /*** 鍗曚釜鍛樺伐ID **/
+ private String employeeId;
+ /***瑙掕壊ID **/
+ private String roleId;
+
+ /*** 鍏抽敭瀛楁悳绱� **/
+ private String keyWord;
+
+ /*** 鍒涘缓鏃堕棿**/
+ private Date startTime;
+ private Date endTime;
+
+ /*** 鍥炶鏃堕棿**/
+ private Date returnVisitStartTime;
+ private Date returnVisitEndTime;
+
+ /*** 瀹屾垚鏃堕棿**/
+ private Date doneStartTime;
+ private Date doneEndTime;
+
+ /*** 鍥炶绫诲瀷 **/
+ private String returnVisitType;
+ /*** 鍥炶璁″垝**/
+ private String returnVisitPlan;
+ /*** 鍥炶鏂瑰紡 **/
+ private String returnVisitMethod;
+ /*** 鍥炶缁撴灉**/
+ private Integer visitResultStatus;
+
+ /*** 鍥炶鏄惁婊℃剰**/
+ private Integer satisfiedStatus;
+
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+ /*** 鍗曚釜闂ㄥ簵 **/
+ private String shopIds;
+ /*** 闂ㄥ簵idList鍒楄〃**/
+ private List<String> authShopList;
+
+ /*** 鍛樺伐id **/
+ private String corpId;
+ /*** 鍛樺伐鍚嶇О **/
+ private String corpName;
+
+ /*** 鍒涘缓浜�**/
+ private String createPersonName;
+ /*** 鍒涘缓浜篿d**/
+ private String createPersonId;
+ /*** 鏉ユ簮娓犻亾鏌ヨ**/
+ private String channelType;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
new file mode 100644
index 0000000..c96bc12
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
@@ -0,0 +1,17 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+
+@Data
+public class ReturnVisitRecordInfoVo {
+
+ /*** 鍥炶璁板綍鏍囪瘑 **/
+ private String id;
+ /*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
+ private String content;
+
+
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..82d9aee
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
@@ -0,0 +1,59 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**鍥炶璁板綍鏂板鎴栬�呮洿鏂颁娇鐢╒O
+ * @author CJH*/
+@Data
+public class ReturnVisitRecordInsertVo {
+
+ /*******************涓嬮潰鏄柊澧�/淇敼浣跨敤鍙傛暟**************************/
+
+ /*** 鍥炶璁板綍鏍囪瘑 **/
+ private String id;
+ /*** 鎵�灞炵敤鎴�**/
+ private String userId;
+ /*** 璁″垝鏃堕棿**/
+ private Date planTime;
+ /*** 鍥炶绫诲瀷 **/
+ private String returnVisitType;
+ /*** 鍥炶鏂瑰紡 **/
+ private String returnVisitMethod;
+ /*** 鍥炶缁撴灉**/
+ private Integer visitResultStatus;
+ /*** 闂ㄥ簵**/
+ private String shopId;
+ /*** 鍛樺伐id **/
+ private String corpId;
+
+ /*** 鏂板 閫夋嫨椤圭洰鏁版嵁 **/
+ private String projectIds;
+ /*** 鏂板 閫夋嫨娲诲姩鏁版嵁**/
+ private String activityIds;
+
+ /*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
+ private String content;
+ /*** 鍥炶澶囨敞锛堝垱寤哄洖璁垮～鍐欙級**/
+ private String remark;
+
+ /*** 鍒涘缓浜虹被鍨� 0 绗笁鏂瑰钩鍙�(鍛樺伐淇℃伅) 锛�2 绯荤粺鍒涘缓**/
+ private Integer createPersonType = 1;
+ /*** 鍒涘缓浜篿d**/
+ private String createPersonId;
+
+ /*** 鎿嶄綔浜篿d**/
+ private String operationId;
+
+ /*** 鐗规畩瀛楁 淇敼浼犲�� 鍥炶鍐呭 澶氫釜**/
+ private List<ReturnVisitRecordInfoVo> itemList;
+
+ /*********************************************/
+
+ /*** 鎵归噺鎿嶄綔ID**/
+ private Set<String> ids;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..420213a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java
@@ -0,0 +1,38 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**鍛樺伐鍥炶浣跨敤VO
+ * @author CJH*/
+@Data
+public class ReturnVisitVisitVo {
+
+ /*** 鍥炶鏃ユ湡**/
+ private Date returnVisitTime;
+ /*** 鍥炶缁撴灉**/
+ private Integer visitResultStatus;
+ /*** 鍥炶鏄惁婊℃剰**/
+ private Integer satisfiedStatus;
+ /*** 鍥炶璇︽儏锛堝憳宸ュ洖璁垮～鍐欙級**/
+ private String content;
+ /*** 鍥炶澶囨敞锛堝憳宸ュ垱寤哄洖璁垮～鍐欙級**/
+ private String remark;
+
+ /*** 鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級**/
+ private String situation;
+ /*** 鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐�**/
+ private String visitRemark;
+
+ /*** 鎿嶄綔浜篿d**/
+ private String operationId;
+
+ /*** 鎵归噺鎿嶄綔ID**/
+ private Set<String> ids;
+
+
+
+}
\ No newline at end of file
--
Gitblit v1.8.0