From 4fd2009fca6dfbc7401ee2e32a660dcbe26e3100 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 27 五月 2024 18:19:12 +0800
Subject: [PATCH] 回访
---
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 | 22 +-
/dev/null | 149 ------------------
phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java | 8
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 | 5
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java | 13
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 93 +++++-----
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java | 38 ++++
9 files changed, 251 insertions(+), 222 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
index 7073944..6fc0ba4 100644
--- 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
@@ -1,7 +1,7 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
-import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordDto;
+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;
@@ -15,9 +15,9 @@
/*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍鍒楄〃 **/
@PostMapping(value = "/return/visit/record/list")
- Result returnVisitList(@RequestBody ReturnVisitRecordDto followListVo);
+ Result returnVisitList(@RequestBody ReturnVisitRecordFindVo findData);
- /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍鍒楄〃 **/
+ /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍璇︽儏 **/
@PostMapping(value = "/return/visit/record/detail")
- Result returnVisitDetail(@RequestBody ReturnVisitRecordDto followListVo);
+ 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
index cb87263..d6a7a46 100644
--- 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
@@ -1,14 +1,10 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.consultation.ConsultRecordDto;
-import com.hz.phis.dt.returnVisitRecord.UserReturnVisitInfoDto;
-import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordDto;
+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;
-
-import java.util.List;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -20,51 +16,51 @@
* 寮�鏀惧钩鍙�-鍥炶璁板綍鏂板
*/
@PostMapping(value = "/return/visit/record/v2/add")
- Result add(@RequestBody ReturnVisitRecordDto dto);
+ Result add(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鍥炶璁板綍淇敼
*/
@PostMapping(value = "/return/visit/record/v2/update")
- Result update(@RequestBody ReturnVisitRecordDto dto);
+ Result update(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鎵归噺淇敼鍥炶浜�
*/
@PostMapping(value = "/return/visit/record/v2/batch/update/corp/user")
- Result batchUpdateCorpUser(@RequestBody ReturnVisitRecordDto dto);
+ Result batchUpdateCorpUser(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鎵归噺淇敼璁″垝鏃堕棿
*/
@PostMapping(value = "/return/visit/record/v2/batch/update/plan/time")
- Result batchUpdatePlanTime(@RequestBody ReturnVisitRecordDto dto);
+ Result batchUpdatePlanTime(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鍙栨秷
*/
@PostMapping(value = "/return/visit/record/v2/cancel")
- Result cancelData(@RequestBody ReturnVisitRecordDto dto);
+ Result cancelData(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鎵归噺鍙栨秷
*/
@PostMapping(value = "/return/visit/record/v2/batch/cancel")
- Result batchCancelData(@RequestBody ReturnVisitRecordDto dto);
+ Result batchCancelData(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鍒犻櫎
*/
@PostMapping(value = "/return/visit/record/v2/delete")
- Result delete(@RequestBody ReturnVisitRecordDto dto);
+ Result delete(@RequestBody ReturnVisitRecordInsertVo dto);
/**
* 寮�鏀惧钩鍙�-鍥炶
*/
@PostMapping(value = "/return/visit/record/v2/access")
- Result access(@RequestBody ReturnVisitRecordDto dto);
+ Result access(@RequestBody ReturnVisitRecordInsertVo dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitInfoDto.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
similarity index 88%
rename from phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitInfoDto.java
rename to phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
index eb9366d..881a114 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.returnVisitRecord;
+package com.hz.phis.vo.returnVisitRecord;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.hx.util.MapUtil;
@@ -8,11 +8,10 @@
/**鍥炶鍒楄〃瀛愰」鏁版嵁
+ * @author CJH
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Data
-public class UserReturnVisitInfoDto {
-
+public class ReturnVisitListItemVo {
/*** 瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�**/
private Integer timeoutStatus;
@@ -38,17 +37,17 @@
private String content;
/*** 鍥炶澶囨敞**/
private String remark;
- /***id **/
+ /*** 鍥炶璁板綍鏍囪瘑 **/
private String id;
//鍒涘缓浜�
private String createPersonName;
- public UserReturnVisitInfoDto() {
+ public ReturnVisitListItemVo() {
}
- public UserReturnVisitInfoDto(Map<String,Object> visitRecord) {
+ public ReturnVisitListItemVo(Map<String,Object> visitRecord) {
this.id = visitRecord.get("id").toString();
this.timeoutStatus = MapUtil.getInt(visitRecord,"timeoutStatus");
this.returnVisitStatus = MapUtil.getInt(visitRecord,"returnVisitStatus");
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitListDto.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
similarity index 67%
rename from phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitListDto.java
rename to phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
index 62d0c6b..f740762 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitListDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.returnVisitRecord;
+package com.hz.phis.vo.returnVisitRecord;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.hx.util.DateUtil;
@@ -9,111 +9,112 @@
/**
* 鍥炶鍒楄〃杩斿洖dto
+ * @author CJH
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Data
-public class UserReturnVisitListDto {
+public class ReturnVisitListVo {
- //鐢ㄦ埛id
+ /**鐢ㄦ埛id*/
private String userId;
- //鐢ㄦ埛鍚嶇О
+ /**鐢ㄦ埛鍚嶇О*/
private String userName;
- //鍛樺伐id
+ /**鍛樺伐鏍囪瘑*/
private String corpId;
- //鍛樺伐鍚嶇О
+ /**鍛樺伐鍚嶇О*/
private String corpName;
- //璁″垝鏃ユ湡
+ /**璁″垝鏃ユ湡*/
private Date planTime;
- //鍥炶鏃堕棿
+ /**鍥炶鏃堕棿*/
private Date returnVisitTime;
- //瀹屾垚鏃堕棿
+ /**瀹屾垚鏃堕棿*/
private Date doneTime;
- //鐢ㄦ埛鐢熸棩
+ /**鐢ㄦ埛鐢熸棩*/
private String birthDay;
- //CIQ
+ /**CIQ*/
private String CIQ;
- //浼氬憳鍙�
+ /**浼氬憳鍙�*/
private String memberNO;
- //鎵嬫満鍙�
+ /**鎵嬫満鍙�*/
private String tel;
- //娓犻亾鏉ユ簮
+ /**娓犻亾鏉ユ簮*/
private String channelType;
+ /**娓犻亾鏉ユ簮*/
private String channelType2;
- //椤鹃棶鍚嶇О
+ /**椤鹃棶鍚嶇О*/
private String cnName;
// --- 鍙栧�肩涓�涓� todo
- //鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�
+ /**鍥炶鐘舵�� 0鏈洖璁� 1宸插洖璁�*/
private Integer returnVisitStatus;
- //瀹屾垚鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�
+ /**瀹屾垚鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�*/
private Integer doneStatus;
- //瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�
+ /**瓒呮椂鐘舵�� 0鏈秴鏃� 1宸茶秴鏃�*/
private Integer timeoutStatus;
- //鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触
+ /**鍥炶缁撴灉 0 鏈煡 1鍥炶鎴愬姛 2鍥炶澶辫触*/
private Integer visitResultStatus;
- //鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�
+ /**鍥炶鏄惁婊℃剰 0 鏈煡 1婊℃剰 2涓嶆弧鎰�*/
private Integer satisfiedStatus;
+
//--- 鍙栧�肩涓�涓� todo
- //鐢ㄦ埛鎵�灞為棬搴楁爣璇� id
+ /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� id*/
private Set<String> ids = new HashSet<>();
- //鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖
+ /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖*/
private Set<String> shopIds = new HashSet<>();
- //鐢ㄦ埛鎵�灞為棬搴楀悕绉�
+ /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
private Set<String> shopNames = new HashSet<>();
- //鍥炶绫诲瀷 瀛楀吀id"
+ /**鍥炶绫诲瀷 瀛楀吀id"*/
private Set<String> returnVisitTypes = new HashSet<>();
- //鍥炶绫诲瀷鍚嶇О
+ /**鍥炶绫诲瀷鍚嶇О*/
private Set<String> returnVisitTypeNames = new HashSet<>();
- //鍥炶鏂瑰紡 瀛楀吀id
+ /**鍥炶鏂瑰紡 瀛楀吀id*/
private Set<String> returnVisitMethods = new HashSet<>();
- //鍥炶鏂瑰紡鍚嶇О
+ /**鍥炶鏂瑰紡鍚嶇О*/
private Set<String> returnVisitMethodNames = new HashSet<>();
- //鍒涘缓浜�
- private Set<String> createPersonNames;
+ /**鍒涘缓浜�*/
+ private Set<String> createPersonNames = new HashSet<>();
- //鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級
+ /**鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
private String situation;
- //鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級
+ /**鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
private String visitRemark;
- //鍥炶椤圭洰
+ /**鍥炶椤圭洰*/
private List<String> projectList;
/*** 鍥炶鍒楄〃瀛愭暟鎹�**/
- private List<UserReturnVisitInfoDto> userReturnVisitInfoList;
+ private List<ReturnVisitListItemVo> itemList = new ArrayList<>();
- //---鏌ヨ杩斿洖鐨�
- //id
+ //---鏌ヨ棰濆杩斿洖鐨勫弬鏁�
+ /**id*/
private String id;
- //鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖
+ /**鐢ㄦ埛鎵�灞為棬搴楁爣璇� 杩斿洖*/
private String shopId ;
- //鐢ㄦ埛鎵�灞為棬搴楀悕绉�
+ /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
private String shopName ;
- //鍥炶绫诲瀷 瀛楀吀id"
+ /**鍥炶绫诲瀷 瀛楀吀id"*/
private String returnVisitType;
- //鍥炶绫诲瀷鍚嶇О
+ /**鍥炶绫诲瀷鍚嶇О*/
private String returnVisitTypeName;
- //鍥炶鏂瑰紡 瀛楀吀id
+ /**鍥炶鏂瑰紡 瀛楀吀id*/
private String returnVisitMethod ;
- //鍥炶鏂瑰紡鍚嶇О
+ /**鍥炶鏂瑰紡鍚嶇О*/
private String returnVisitMethodName;
-
- //鍒涘缓浜�
+ /**鍒涘缓浜�*/
private String createPersonName;
- public UserReturnVisitListDto() {
+ public ReturnVisitListVo() {
}
- public UserReturnVisitListDto(Map<String,Object> recordMap) {
+ public ReturnVisitListVo(Map<String,Object> recordMap) {
this.userId = MapUtil.getString(recordMap,"userId");
this.userName = MapUtil.getString(recordMap,"userName");
this.corpId = MapUtil.getString(recordMap,"corpId");
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordDto.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordDto.java
deleted file mode 100644
index 5932af5..0000000
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordDto.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.hz.phis.vo.returnVisitRecord;
-
-import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.returnVisitRecord.UserReturnVisitInfoDto;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-@Data
-public class ReturnVisitRecordDto 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 createPersonName;
- /*** 鍒涘缓浜篿d**/
- private String createPersonId;
- /*** 鏉ユ簮娓犻亾鏌ヨ**/
- private String channelType;
-
- /*** 鍛樺伐id **/
- private String corpId;
- /*** 鍛樺伐鍚嶇О **/
- private String corpName;
-
- /*** 鍗曚釜闂ㄥ簵 **/
- private String shopIds;
- /*** 闂ㄥ簵idList鍒楄〃**/
- private List<String> authShopList;
-
- /*** 鏂板 閫夋嫨椤圭洰鏁版嵁 **/
- private String projectIds;
- /*** 鏂板 閫夋嫨娲诲姩鏁版嵁**/
- private String activityIds;
-
-
- /*** 鐢ㄦ埛鎵�灞為棬搴楀悕绉�**/
- private String shopName;
- /*** 鐢ㄦ埛鍚嶇О**/
- private String userName;
- /*** 鍥炶绫诲瀷鍚嶇О**/
- private String returnVisitTypeName;
- /*** 鍥炶绫诲瀷鍚嶇О**/
- private String returnVisitPlanName;
- /*** 鍥炶鏂瑰紡鍚嶇О**/
- private String returnVisitMethodName;
- /*** 鍥炶鏃堕棿**/
- private Date returnVisitTime;
- /*** 瀹屾垚鏃堕棿**/
- private Date doneTime;
-
- /*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
- private String content;
- /*** 鍥炶澶囨敞锛堝垱寤哄洖璁垮～鍐欙級**/
- private String remark;
-
- /*** 鍒涘缓浜虹被鍨� 0 绗笁鏂瑰钩鍙�(鍛樺伐淇℃伅) 1 鍚庡彴 (鍚庡彴鐢ㄦ埛淇℃伅)锛�2 绯荤粺鍒涘缓**/
- private Integer createPersonType = 1;
-
- /*** 鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級**/
- private String situation;
- /*** 鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐�**/
- private String visitRemark;
-
- /*** 瑙勫垯鏍囪瘑**/
- private String ruleId;
- /*** 鍥炶椤圭洰**/
- private String items;
-
- /*** 鎿嶄綔浜篿d**/
- private String operationId;
- /*** 鎿嶄綔浜哄悕绉�**/
- private String operationName;
-
-
- /*** 鎵归噺鎿嶄綔ID**/
- private Set<String> ids;
-
-
- /*** 淇敼浼犲�� 鍥炶鍐呭 澶氫釜**/
- private List<ReturnVisitRecordInfoDto> infoDtoList;
- /*** 鏌ヨ璇︽儏閲岀殑瀛愰」鏁版嵁 淇敼鏃堕渶瑕�**/
- private List<UserReturnVisitInfoDto> userInfoDtoList;
-
-
-
- /**鏈煡*/
- public static final int VISIT_RESULT_STATUS_NONE = 0;
- /**鎴愬姛*/
- public static final int VISIT_RESULT_STATUS_SUC = 1;
- /**澶辫触*/
- public static final int VISIT_RESULT_STATUS_FAIL = 2;
-
-
-}
\ No newline at end of file
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/ReturnVisitRecordInfoDto.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
similarity index 63%
rename from phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoDto.java
rename to phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
index b6d945e..c96bc12 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoVo.java
@@ -1,13 +1,12 @@
package com.hz.phis.vo.returnVisitRecord;
-import com.hz.his.dto.PageDto;
import lombok.Data;
@Data
-public class ReturnVisitRecordInfoDto extends PageDto {
+public class ReturnVisitRecordInfoVo {
- /*** id **/
+ /*** 鍥炶璁板綍鏍囪瘑 **/
private String id;
/*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
private String content;
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