From 9613599e14008991485ac021d591fc48606050d6 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 09 五月 2024 19:01:50 +0800
Subject: [PATCH] Merge branch 'fhx-prod-0506电子签修改' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java | 18 +++++++++++++++---
phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java | 25 +++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 16 ++++++++++++++++
3 files changed, 56 insertions(+), 3 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
new file mode 100644
index 0000000..ee40c09
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.fdd;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 娉曞ぇ澶х缃蹭汉娴嬪弬涓庝汉
+ * @USER: fhx
+ * @DATE: 2024/3/6
+ **/
+@Data
+public class FddActorDto {
+
+ /** 鍙備笌浜虹被鍨� */
+ private String actorType;
+
+ /** 瀹氫綅X杞翠綅缃� */
+ private String positionX;
+ /** 瀹氫綅Y杞翠綅缃� */
+ private String positionY;
+ /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
+ private int positionPageNo = 1;
+
+
+}
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 fdf078c..c273def 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
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @USER: fhx
* @DATE: 2024/3/6
@@ -21,6 +23,8 @@
private String signTemplateId;
/** 绛剧讲浠诲姟妯℃澘鍚嶇О */
private String signTemplateName;
+ /** 妯℃澘绫诲瀷(鐢靛瓙鐥呭巻鍜屽鏂规椂閫夋嫨鐨勬ā鏉�) */
+ private String templateType;
/** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
private Integer opType;
@@ -45,10 +49,22 @@
/** 绛剧珷id */
private String sealId;
+ //浣滃簾绛剧讲鐢ㄥ埌
/** 瀹氫綅X杞翠綅缃� */
private String positionX;
/** 瀹氫綅Y杞翠綅缃� */
private String positionY;
/** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
private int positionPageNo = 1;
+
+ //鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌
+ /** 鍙備笌浜虹被鍨�(FddActorConstants) */
+ private String actorType;
+ /** 鍙備笌浜鸿瘉浠剁被鍨� */
+ private String certType;
+
+// /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
+// private String actorListStr;
+// /** 绛剧讲鍙備笌浜� */
+// private List<FddActorDto> actorList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
index 99fb1fe..df278bc 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -36,9 +36,21 @@
@RequestMapping(value="/fdd/sign/task/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);
- /** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
- @RequestMapping("/fdd/sign/task/cancelSignTask")
- Result cancelSignTask(@RequestBody FddDto dto);
+ /** 鏂板鏂囨。绛剧讲浠诲姟鍙備笌浜� */
+ @RequestMapping("/fdd/sign/task/addDocSignTaskActor")
+ Result addDocSignTaskActor(@RequestBody FddDto dto);
+
+ /** 鎾ら攢绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/cancel")
+ Result cancel(@RequestBody FddDto dto);
+
+ /** 浣滃簾绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/abolish")
+ Result abolish(@RequestBody FddDto dto);
+
+ /** 瀹屾垚绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/finish")
+ Result finish(@RequestBody FddDto dto);
/** 鑾峰彇绛剧讲浠诲姟鏂囦欢涓嬭浇鍦板潃 */
@PostMapping(value = "/fdd/sign/task/getSignTaskFileUrl")
--
Gitblit v1.8.0