From 18dcbf0a7fb4cb3d674d21225a05952a228563c4 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 26 四月 2023 10:23:28 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java | 33 +++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java | 7 ++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
new file mode 100644
index 0000000..2c3dac3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
@@ -0,0 +1,33 @@
+package com.hz.his.dto.project;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProjectWarnRecordDto {
+
+ // 椤�
+ private Integer pageNum;
+ // 姣忛〉鏁伴噺
+ private Integer pageSize;
+ // 鐢ㄦ埛id
+ private String userId;
+ // 鍏叡鏍囪瘑
+ private String commonId;
+ // 鍏叡鍚嶇О
+ private String commonName;
+ // 涓婄骇鍏叡鏍囪瘑
+ private String parentCommonId;
+ // 涓婄骇鍏叡鍚嶇О
+ private String parentCommonName;
+ // 寮�濮嬫棩鏈�
+ private Date startTime;
+ // 缁撴潫鏃ユ湡
+ private Date endTime;
+ // 鍏抽敭璇嶆煡璇� CIQ 浼氬憳鍚嶇О 鎵嬫満鍙�
+ private String keyWord;
+
+ public ProjectWarnRecordDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
index 5369c16..d4eeecd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
@@ -2,8 +2,8 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.his.dto.consumables.GoodsQueryDto;
import com.hz.his.dto.project.ProjectQueryDto;
+import com.hz.his.dto.project.ProjectWarnRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,4 +33,9 @@
@PostMapping(value = "/project/detail")
Result projectDetail(@RequestBody ProjectQueryDto projectQueryDto);
+ /**
+ * 寮�鏀惧钩鍙�-椤圭洰棰勮璁板綍鍒楄〃
+ */
+ @PostMapping(value = "/project/warn/record/list")
+ Result projectWarnRecordList(@RequestBody ProjectWarnRecordDto projectWarnRecordDto);
}
\ No newline at end of file
--
Gitblit v1.8.0