From 833fde7fb397fa66c9e695e8f9376ee9d5b9723c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 10 九月 2024 10:12:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjh-basefun-回访重构' into master-jiayan-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipReturnVisitRecordService.java | 7 ++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchVo.java | 59 +++++++++++++++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchProjectVo.java | 22 +++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java | 2
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchAllotVo.java | 22 +++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVo.java | 21 +++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 3 +
7 files changed, 136 insertions(+), 0 deletions(-)
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 fc9ab0d..7dad174 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,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.phis.vo.returnVisitRecord.ReturnVisitBatchVo;
import com.hz.phis.vo.returnVisitRecord.ReturnVisitRecordInsertVo;
import com.hz.phis.vo.returnVisitRecord.ReturnVisitVisitVo;
import org.springframework.cloud.openfeign.FeignClient;
@@ -70,4 +71,10 @@
@PostMapping(value = "/return/visit/record/v2/access")
Result access(@RequestBody ReturnVisitVisitVo dto);
+ /**
+ * 寮�鏀惧钩鍙�-鎵归噺鏂板
+ */
+ @PostMapping(value = "/return/visit/record/v2/batch/add")
+ Result batchAddData(@RequestBody ReturnVisitBatchVo dto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchAllotVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchAllotVo.java
new file mode 100644
index 0000000..973a7ee
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchAllotVo.java
@@ -0,0 +1,22 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+
+/**
+ * 鍥炶璁″垝鎵归噺鏂板-鍒嗛厤鍛樺伐/瑙掕壊
+ *
+ * @author rx
+ */
+@Data
+public class ReturnVisitBatchAllotVo {
+
+
+ /*** 瑙掕壊鎴栧憳宸D **/
+ private String commonId;
+ /*** 瑙掕壊鍚嶇О/鍛樺伐鍚嶇О**/
+ private String commonName;
+ /*** 鍒嗛厤鏁伴噺 鍒嗛厤绫诲瀷涓哄憳宸ユ椂濉啓**/
+ private Integer commonNum;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchProjectVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchProjectVo.java
new file mode 100644
index 0000000..c635608
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchProjectVo.java
@@ -0,0 +1,22 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍥炶璁″垝鎵归噺鏂板 -鍥炶椤圭洰
+ *
+ * @author rx
+ */
+@Data
+public class ReturnVisitBatchProjectVo {
+
+ /*** 鍒嗙被ID **/
+ private String projectCategoryId;
+ /*** spuId **/
+ private String projectId;
+ /*** sku 澶氫釜 **/
+ private List<String> skuIdList;
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchVo.java
new file mode 100644
index 0000000..225ef04
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitBatchVo.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.Map;
+import java.util.Set;
+
+/**
+ * 鎵归噺鍥炶璁″垝- 鏂板 浣跨敤
+ *
+ * @author rx
+ */
+@Data
+public class ReturnVisitBatchVo {
+
+ /*** 鍔犲瘑鏌ヨsql璇彞 **/
+ private String sql;
+ /*** sql 鍙傛暟 **/
+ private Map<String,Object> params;
+ /*** 鍓旈櫎鐢ㄦ埛ID List**/
+ private Set<String> userIdRemoveList;
+ /*** 鐢ㄦ埛ID List**/
+ private Set<String> userIdList;
+
+ /*** 闂ㄥ簵**/
+ private String shopId;
+ /*** 鍥炶绫诲瀷 **/
+ private String returnVisitType;
+ /*** 鍥炶鏂瑰紡 **/
+ private String returnVisitMethod;
+
+ /*** 鍒嗛厤瑙掕壊**/
+ private List<ReturnVisitBatchAllotVo> allotRoleList;
+ /*** 鍒嗛厤鍛樺伐鏁版嵁**/
+ private List<ReturnVisitBatchAllotVo> allotEmployeeList;
+
+ /*** 鍥炶璁″垝鍐呭**/
+ private String content;
+
+ /*** 璁″垝寮�濮嬫椂闂�**/
+ private Date startTime;
+ /*** 璁″垝寮�濮嬫椂闂�**/
+ private Date endTime;
+
+ /*** 椤圭洰鏁版嵁 **/
+ private List<ReturnVisitBatchProjectVo> projectDataList;
+
+ /*** 澶囨敞**/
+ private String remark;
+
+ /*** 鍒涘缓浜虹被鍨� 0 绗笁鏂瑰钩鍙�(鍛樺伐淇℃伅) 1 鍚庡彴 (鍚庡彴鐢ㄦ埛淇℃伅)锛�2 绯荤粺鍒涘缓**/
+ private Integer createPersonType;
+ /*** 鍒涘缓浜篿d**/
+ private String createPersonId;
+
+
+}
\ 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
index b9838b2..d068588 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
@@ -50,6 +50,8 @@
private String remark;
/*** 鍥炶璁板綍鏍囪瘑 **/
private String id;
+ /***璁″垝鍛ㄦ湡**/
+ private Integer cycleDay;
/**鍒涘缓浜�*/
private String 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 6d22feb..01b6027 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
@@ -29,6 +29,8 @@
private Date returnVisitTime;
/**瀹屾垚鏃堕棿*/
private Date doneTime;
+ /***璁″垝鍛ㄦ湡**/
+ private Integer cycleDay;
/**鐢ㄦ埛鐢熸棩*/
private String birthDay;
@@ -116,6 +118,7 @@
this.satisfiedStatus = MapUtil.getInt(recordMap,"satisfiedStatus");
this.situation = MapUtil.getString(recordMap,"situation");
this.visitRemark = MapUtil.getString(recordMap,"visitRemark");
+ this.cycleDay = MapUtil.getInt(recordMap,"cycleDay");
}
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVo.java
new file mode 100644
index 0000000..46a1c43
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVo.java
@@ -0,0 +1,21 @@
+package com.hz.phis.vo.returnVisitRecord;
+
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+public class ReturnVisitVo {
+
+ /***鍛樺伐/瑙掕壊ID **/
+ private String commonId;
+ /***璁″垝鏃堕棿 **/
+ private String planTime;
+ /***鐢ㄦ埛 **/
+ private Set<String> userIds;
+
+
+
+ public ReturnVisitVo() {
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0