From c4454cb51fb6ad7297721f9f3a0138da49888862 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 23 五月 2024 10:17:04 +0800
Subject: [PATCH] 修改回访查询等

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java |   70 ++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SReturnVisitRecordService.java         |   23 ++
 phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitInfoDto.java         |   68 ++++++++
 phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitListDto.java         |  140 +++++++++++++++++
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordDto.java           |  149 ++++++++++++++++++
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoDto.java       |   18 ++
 6 files changed, 468 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..7073944
--- /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.ReturnVisitRecordDto;
+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 ReturnVisitRecordDto followListVo);
+
+    /*** 鑾峰彇鐢ㄦ埛鍥炶璁板綍鍒楄〃 **/
+    @PostMapping(value = "/return/visit/record/detail")
+    Result returnVisitDetail(@RequestBody ReturnVisitRecordDto followListVo);
+}
\ 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..cb87263
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java
@@ -0,0 +1,70 @@
+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 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 鏄姹傛帴鍙ｅ墠缂�
+ */
+@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 ReturnVisitRecordDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍥炶璁板綍淇敼
+     */
+    @PostMapping(value = "/return/visit/record/v2/update")
+    Result update(@RequestBody ReturnVisitRecordDto dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺淇敼鍥炶浜�
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/update/corp/user")
+    Result batchUpdateCorpUser(@RequestBody ReturnVisitRecordDto dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺淇敼璁″垝鏃堕棿
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/update/plan/time")
+    Result batchUpdatePlanTime(@RequestBody ReturnVisitRecordDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍙栨秷
+     */
+    @PostMapping(value = "/return/visit/record/v2/cancel")
+    Result cancelData(@RequestBody ReturnVisitRecordDto dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鎵归噺鍙栨秷
+     */
+    @PostMapping(value = "/return/visit/record/v2/batch/cancel")
+    Result batchCancelData(@RequestBody ReturnVisitRecordDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍒犻櫎
+     */
+    @PostMapping(value = "/return/visit/record/v2/delete")
+    Result delete(@RequestBody ReturnVisitRecordDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍥炶
+     */
+    @PostMapping(value = "/return/visit/record/v2/access")
+    Result access(@RequestBody ReturnVisitRecordDto 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/dt/returnVisitRecord/UserReturnVisitInfoDto.java
new file mode 100644
index 0000000..eb9366d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitInfoDto.java
@@ -0,0 +1,68 @@
+package com.hz.phis.dt.returnVisitRecord;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.hx.util.MapUtil;
+import lombok.Data;
+
+import java.util.Map;
+
+
+/**鍥炶鍒楄〃瀛愰」鏁版嵁
+ */
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@Data
+public class UserReturnVisitInfoDto {
+
+
+    /*** 瓒呮椂鐘舵�� 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;
+    /***id **/
+    private String id;
+    //鍒涘缓浜�
+    private String createPersonName;
+
+
+
+    public UserReturnVisitInfoDto() {
+    }
+
+    public UserReturnVisitInfoDto(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/dt/returnVisitRecord/UserReturnVisitListDto.java b/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitListDto.java
new file mode 100644
index 0000000..62d0c6b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/returnVisitRecord/UserReturnVisitListDto.java
@@ -0,0 +1,140 @@
+package com.hz.phis.dt.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
+ */
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@Data
+public class UserReturnVisitListDto {
+
+    //鐢ㄦ埛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
+    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;
+
+    //鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級
+    private String situation;
+    //鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級
+    private String visitRemark;
+
+    //鍥炶椤圭洰
+    private List<String> projectList;
+
+    /*** 鍥炶鍒楄〃瀛愭暟鎹�**/
+    private List<UserReturnVisitInfoDto> userReturnVisitInfoList;
+
+
+    //---鏌ヨ杩斿洖鐨�
+    //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 UserReturnVisitListDto() {
+    }
+
+    public UserReturnVisitListDto(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/ReturnVisitRecordDto.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordDto.java
new file mode 100644
index 0000000..5932af5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordDto.java
@@ -0,0 +1,149 @@
+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/ReturnVisitRecordInfoDto.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoDto.java
new file mode 100644
index 0000000..b6d945e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInfoDto.java
@@ -0,0 +1,18 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+
+@Data
+public class ReturnVisitRecordInfoDto extends PageDto {
+
+    /*** id **/
+    private String id;
+    /*** 鍥炶璇︽儏锛堝垱寤哄洖璁垮～鍐欙級**/
+    private String content;
+
+
+
+
+}
\ No newline at end of file

--
Gitblit v1.8.0