From 1fe39b9d3a55b577726dfd76dbc3a6c4ed1417b7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 12 九月 2024 09:57:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjh-basefun-回访重构' into master-jiayan-test
---
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java | 16 ++++++++++++----
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java | 8 ++++++++
phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitVisitVo.java | 17 ++++++++++++++++-
3 files changed, 36 insertions(+), 5 deletions(-)
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 01b6027..4febc72 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
@@ -69,6 +69,12 @@
/**鍥炶澶囨敞锛堝憳宸ュ洖璁挎椂鍊欏～鍐欙級*/
private String visitRemark;
+ //--- 鍙栧�肩涓�涓� todo
+ /**鍒涘缓绫诲瀷*/
+ private Integer createPersonType;
+ /**鍥炶鏍囪瘑*/
+ private String returnVisitId;
+
/*** 鍥炶鍒楄〃瀛愭暟鎹�**/
private List<ReturnVisitListItemVo> itemList = new ArrayList<>();
@@ -119,6 +125,8 @@
this.situation = MapUtil.getString(recordMap,"situation");
this.visitRemark = MapUtil.getString(recordMap,"visitRemark");
this.cycleDay = MapUtil.getInt(recordMap,"cycleDay");
+ this.createPersonType = MapUtil.getInt(recordMap,"createPersonType");
+ this.returnVisitId = MapUtil.getString(recordMap,"id");
}
}
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
index 31b194c..c695ce8 100644
--- 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
@@ -50,11 +50,11 @@
/*** 鍥炶鏄惁婊℃剰**/
private Integer satisfiedStatus;
- /**鎵�灞為棬搴�*/
- private List<String> shopIdList;
/***鍥炶鍛樺伐 - List**/
private List<String> employeeIdList;
+ /**鍒涘缓绫诲瀷*/
+ private Integer createPersonType;
/*** 鍒涘缓浜�**/
private String createPersonName;
/*** 鍒涘缓浜篿d**/
@@ -65,11 +65,19 @@
//---棰濆鐨勫弬鏁�
/*** 璁″垝鏃堕棿**/
private Date planTime;
- /*** 鍥炶鍛樺伐鏍囪瘑 **/
+ /*** 鍥炶鍛樺伐鏍囪瘑锛堟煡璇級 **/
private String corpId;
- /**鏌ョ湅鏉冮檺*/
+ //-----鏉冮檺-寮�濮�
+ /**鏉冮檺-鏌ョ湅鏉冮檺锛岃缃繖涓笉鍒ゆ柇浠讳綍鐨勯檺鍒舵潯浠�*/
private Integer seeRoleType = SEE_ROLE_TYPE_CONVENTION;
+ /**鏉冮檺-闂ㄥ簵闆嗗悎*/
+ private List<String> shopIdList;
+ /**鏉冮檺-褰撳墠鐧诲綍浜虹殑瑙掕壊鏍囪瘑*/
+ private String roleCode;
+ /**鏉冮檺-褰撳墠鐧诲綍浜虹殑鏍囪瘑*/
+ private String loginEmpId;
+ //-----鏉冮檺-缁撴潫
//---鑷畾涔夊垎椤碉紝璧拌繖涓病鏈夊垎椤垫ā寮�
/**椤垫暟*/
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 0aaa123..d09ec37 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
@@ -37,6 +37,21 @@
/*** 鎵归噺鎿嶄綔ID**/
private Set<String> ids;
+ //-----杩欓噷鏄笅涓�涓洖璁胯緟鍔╁弬鏁�-寮�濮�
+ /**鍥炶涔嬪悗-涓嬩竴涓洖璁跨殑鏁版嵁绫诲瀷*/
+ private int nextType = NEXT_TYPE_CONVENTION;
+ /**鍥炶涔嬪悗-璁″垝鏃堕棿*/
+ private Date nextPlanTime;
+ /**鍥炶涔嬪悗-鍒涘缓鏃堕棿*/
+ private Date nextCreateTime;
+ /**鍥炶涔嬪悗-鍒楄〃鏌ヨ鐨勬暟鎹紙PS:NULL鍊间笉鏌ワ級*/
+ private ReturnVisitRecordFindVo findListData;
+ //-----杩欓噷鏄笅涓�涓洖璁胯緟鍔╁弬鏁�-缁撴潫
-
+ /**鍥炶涔嬪悗-涓嬩竴涓洖璁跨殑鏁版嵁绫诲瀷-甯歌锛屼笉鍋氫笅涓�涓�*/
+ public static final int NEXT_TYPE_CONVENTION = 0;
+ /**鍥炶涔嬪悗-涓嬩竴涓洖璁跨殑鏁版嵁绫诲瀷-鎸囧畾鐢ㄦ埛*/
+ public static final int NEXT_TYPE_USER = 1;
+ /**鍥炶涔嬪悗-涓嬩竴涓洖璁跨殑鏁版嵁绫诲瀷-灞炰簬杩欎釜鍛樺伐鐨�*/
+ public static final int NEXT_TYPE_STAFF_ALL = 2;
}
\ No newline at end of file
--
Gitblit v1.8.0