From a8251744709de9e3ca4063985a67e52b02078343 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 14 六月 2024 14:55:03 +0800
Subject: [PATCH] Merge branch 'fhx-prod-电子签0612' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java | 12 ++++++
phis-feign/src/main/java/com/hz/his/dto/fdd/FddSignFieldDto.java | 25 ++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java | 5 ++
phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java | 24 +++++++++++-
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 37 +++++++++---------
5 files changed, 82 insertions(+), 21 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java
index ee40c09..f815a32 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* 娉曞ぇ澶х缃蹭汉娴嬪弬涓庝汉
* @USER: fhx
@@ -11,8 +13,12 @@
@Data
public class FddActorDto {
- /** 鍙備笌浜虹被鍨� */
- private String actorType;
+ /** 鍙備笌浜烘爣璇� */
+ private String actorId;
+// /** 鍙備笌浜虹被鍨�(FddActorConstants) */
+// private String actorType;
+ /** 鍙備笌浜鸿瘉浠剁被鍨� */
+ private String certType;
/** 瀹氫綅X杞翠綅缃� */
private String positionX;
@@ -20,6 +26,20 @@
private String positionY;
/** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
private int positionPageNo = 1;
+ /** 绛惧悕瀹藉害 */
+ private Integer width;
+ /** 绛惧悕楂樺害 */
+ private Integer height;
+ /** 鍙備笌浜虹敤鎴风被鍨�(FddConstants) */
+ private Integer userType;
+ /** 鍙備笌浜虹敤鎴�(鍛樺伐)鏍囪瘑 */
+ private String userId;
+
+ /** 绛剧珷鎺т欢鍒楄〃 */
+ private List<FddSignFieldDto> signFields;
+ /** 濉啓鎺т欢鍒楄〃 */
+ private List<FddSignFieldDto> fillFields;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
index 9a31982..356f7cb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -19,6 +19,9 @@
/** 闂ㄥ簵鏍囪瘑 */
private String shopId;
+ /** 瑙掕壊绫诲瀷 */
+ private String roleType;
+
/** 绛剧讲妯℃澘ID */
private String signTemplateId;
/** 绛剧讲浠诲姟妯℃澘鍚嶇О */
@@ -51,26 +54,22 @@
/** 绛剧珷id */
private String sealId;
- //浣滃簾绛剧讲鐢ㄥ埌
- /** 瀹氫綅X杞翠綅缃� */
- private String positionX;
- /** 瀹氫綅Y杞翠綅缃� */
- private String positionY;
- /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
- private int positionPageNo = 1;
- /** 绛惧悕瀹藉害 */
- private Integer width;
- /** 绛惧悕楂樺害 */
- private Integer height;
+// //浣滃簾绛剧讲鐢ㄥ埌
+// /** 瀹氫綅X杞翠綅缃� */
+// private String positionX;
+// /** 瀹氫綅Y杞翠綅缃� */
+// private String positionY;
+// /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
+// private int positionPageNo = 1;
+// /** 绛惧悕瀹藉害 */
+// private Integer width;
+// /** 绛惧悕楂樺害 */
+// private Integer height;
//鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌
- /** 鍙備笌浜虹被鍨�(FddActorConstants) */
- private String actorType;
- /** 鍙備笌浜鸿瘉浠剁被鍨� */
- private String certType;
-// /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
-// private String actorListStr;
-// /** 绛剧讲鍙備笌浜� */
-// private List<FddActorDto> actorList;
+ /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
+ private String actorListStr;
+ /** 绛剧讲鍙備笌浜� */
+ private List<FddActorDto> actorList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddSignFieldDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddSignFieldDto.java
new file mode 100644
index 0000000..d291399
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddSignFieldDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.fdd;
+
+import lombok.Data;
+
+/**
+ * 娉曞ぇ澶х缃叉帶浠禿to
+ * @USER: fhx
+ * @DATE: 2024/6/12
+ **/
+@Data
+public class FddSignFieldDto {
+
+ /** 鎺т欢鎵�鍦ㄧ殑鏂囨。鏍囪瘑 */
+ private String fieldDocId;
+ /** 鎺т欢缂栫爜 */
+ private String fieldId;
+// /** 鎺т欢鍚嶇О(涓嶆帹鑽�) */
+// private String fieldName;
+ /** 鎺т欢缂虹渷濉厖鍊� */
+ private String fieldValue;
+ /** 绛剧珷鏍囪瘑 */
+ private String sealId;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
index 6d50a4d..224d021 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
@@ -19,12 +19,24 @@
private List<String> adviserIdList;
/**椤鹃棶缂栧彿*/
private List<String> adviserNoList;
+ /**鐧诲綍鍛樺伐鏍囪瘑*/
+ private String loginEmpId;
+ /**鐧诲綍鍛樺伐鍚嶇О*/
+ private String loginCnName;
+ /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+ private String loginEmpStr;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
/**鏌ヨ娲昏穬鑰乂IP,娴佸け(娴佸け)/娲昏穬(鐘舵��)/娌夌潯(鐘舵��)涔嬮棿鏄�愭垨銆戝叧绯�0:娴佸け 1:娲昏穬 2:娌夌潯*/
private List<Integer> oldVipList;
/**鏌ヨ瀹㈡埛绛夌骇,绛夌骇涔嬮棿鏄�愭垨銆戝叧绯�*/
private List<String> userLevelList;
+ /**鏌ヨ瀹㈡埛鐘舵��,鐘舵�佷箣闂存槸銆愭垨銆戝叧绯�*/
+ private List<String> statusList;
/**涓夊ぇ椤圭洰鏈墽琛屽ぇ鐨勬槸銆愪笖銆�,鍚勮嚜鏄�愭垨銆�*/
/**鎵撳崱椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
index 7925679..99c78f4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -112,5 +112,10 @@
@PostMapping("/admin/rfmUser/report/user/search/list")
Result userSearchList(@RequestBody UserDetailSelectDto userDetailSelectDto);
+ /**
+ * rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃-瀵煎嚭
+ */
+ @PostMapping("/admin/rfmUser/report/user/search/export")
+ Result userSearchExport(@RequestBody UserDetailSelectDto userDetailSelectDto);
}
--
Gitblit v1.8.0