From c099d49513b6a41fc80d35c461128881709af847 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 23 八月 2023 14:15:05 +0800
Subject: [PATCH] 新增对比照

---
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java                          |   25 ++++
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java                            |   51 ++++++++
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java                                |   37 ++++++
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java                        |   25 ++++
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java                            |   81 +++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java |   74 ++++++++++++
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java                            |   23 +++
 7 files changed, 316 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java
new file mode 100644
index 0000000..b63224b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java
@@ -0,0 +1,74 @@
+package com.hz.his.feign.service.platform.compare;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.compare.CompareDeleteVo;
+import com.hz.his.vo.compare.CompareListVo;
+import com.hz.his.vo.compare.CompareVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**瀵规瘮鐓eign
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ * @author CJH
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "compare-photo")
+public interface SComparePhoteService {
+
+    /**鍒楄〃
+     * @param compareListVo 浼犲弬缁撴瀯
+     * @return
+     */
+    @PostMapping(value = "/compare/photo/record/list")
+    Result listData(@RequestBody CompareListVo compareListVo);
+
+
+    /**鏂板瀵规瘮鐓�
+     * @param compareVo 浼犲弬缁撴瀯
+     * @return
+     */
+    @PostMapping(value = "/compare/photo/record/add")
+    Result add(@RequestBody CompareVo compareVo);
+
+    /**鏌ョ湅瀵规瘮鐓�
+     * @param compareListVo 浼犲弬缁撴瀯
+     * @return data杞寲涓篊ompareDataVo
+     */
+    @PostMapping(value = "/compare/photo/record/see")
+    Result see(@RequestBody CompareListVo compareListVo);
+
+    /**鏇存柊瀵规瘮鐓�
+     * @param compareVo 浼犲弬缁撴瀯
+     */
+    @PostMapping(value = "/compare/photo/record/update")
+    Result update(@RequestBody CompareVo compareVo);
+
+    /**鍒犻櫎瀵规瘮鐓ф�昏褰�
+     * @param compareDeleteVo 浼犲弬缁撴瀯
+     * @return
+     */
+    @PostMapping(value = "/compare/photo/record/delete")
+    Result delete(@RequestBody CompareDeleteVo compareDeleteVo);
+
+    /**鍒犻櫎瀵规瘮鐓у瓙鍗�
+     * @param compareDeleteVo 浼犲弬缁撴瀯
+     * @return
+     */
+    @PostMapping(value = "/compare/photo/record/delete/item")
+    Result deleteItem(@RequestBody CompareDeleteVo compareDeleteVo);
+
+    /**鑾峰彇鐢ㄦ埛椤圭洰
+     * @param compareListVo 浼犲弬缁撴瀯
+     * @return
+     */
+    @PostMapping(value = "/compare/photo/record/user/project")
+    Result userProjectSearchList(@RequestBody CompareListVo compareListVo);
+
+    /**鑾峰彇鐢ㄦ埛鍒掓墸
+     * @param compareListVo 浼犲弬缁撴瀯
+     * @return
+     */
+    @PostMapping(value = "/compare/photo/record/deduction/project")
+    Result userDeductionSearchList(@RequestBody CompareListVo compareListVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java
new file mode 100644
index 0000000..f1d5212
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被
+ * @author CJH
+ */
+@Data
+public class CompareDataItemVo {
+
+    /**瀵规瘮鐓у瓙鍗曟爣璇�*/
+    private String id;
+    /**瑙掑害绫诲瀷*/
+    private Integer angleType;
+    /**绫诲瀷 0鏈墠 1鏈悗 2鍙傝��*/
+    private Integer type;
+    /**鏂囦欢绫诲瀷*/
+    private Integer fileType;
+    /**鍥剧墖/瑙嗛鍦板潃*/
+    private String imgUrl;
+    /**鏄惁瀵瑰鎴峰彲瑙� 0 鍚� 1 鏄�*/
+    private Integer isShow;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java
new file mode 100644
index 0000000..6ecd0a0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java
@@ -0,0 +1,81 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被
+ * @author CJH
+ */
+@Data
+public class CompareDataVo {
+
+    /**瀵规瘮鐓ф爣璇�*/
+    private String id;
+    /**椤圭洰绗嚑娆′笂浼犲姣旂収*/
+    private Integer projectFrequency;
+    /**鐢ㄦ埛椤圭洰鏍囪瘑*/
+    private String userProjectItemId;
+    /**鍒掓墸椤圭洰鏍囪瘑*/
+    private String deductionProjectId;
+    /**鍒掓墸鎬昏〃鏍囪瘑*/
+    private String deductionSingleId;
+    /**澶囨敞*/
+    private String remark;
+
+    /**鍒掓墸椤圭洰鍚嶇О*/
+    private String deductionProjectName;
+    /**鐢ㄦ埛椤圭洰鍚嶇О*/
+    private String userProjectItemName;
+
+    //----椤圭洰淇℃伅
+    /**椤圭洰鏍囪瘑*/
+    private String projectId;
+    /**椤圭洰浠锋牸*/
+    private BigDecimal curPrice;
+    /**椤圭洰鍚嶇О*/
+    private String projectName;
+    /**椤圭洰瑙勬牸*/
+    private String specification;
+
+    //----椤圭洰淇℃伅
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
+    /**鐢ㄦ埛鍚嶇О*/
+    private String userName;
+    /**鐢ㄦ埛CIQ*/
+    private String CIQ;
+    /**鐢ㄦ埛浼氬憳缂栧彿*/
+    private String memberNO;
+    /**鐢ㄦ埛鐥呬緥缂栧彿*/
+    private String caseNO;
+
+    /**鍒掓墸鏃堕棿*/
+    private Date deductionTime;
+
+    /**鎿嶄綔鍛樺伐鏍囪瘑*/
+    private String staffId;
+    /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+    private String staffRoleId;
+
+    /**鏂板鎿嶄綔浜虹被鍨�*/
+    private Integer operatorType;
+    /**鏂板鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鏂板鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
+
+    /**鏈�鍚庡彉鏇存搷浣滀汉绫诲瀷*/
+    private Integer updateOpType;
+    /**鏈�鍚庡彉鏇存搷浣滀汉鏍囪瘑*/
+    private String updateOpId;
+    /**鏈�鍚庡彉鏇存搷浣滀汉鍚嶇О*/
+    private String updateOpName;
+
+    /**瀛愭暟鎹�*/
+    private List<CompareDataItemVo> compareItemList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java
new file mode 100644
index 0000000..9f820f2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍒犻櫎瀹炰綋绫�
+ * @author CJH
+ */
+@Data
+public class CompareDeleteVo {
+
+    /**瀵规瘮鐓ф爣璇�*/
+    private String id;
+
+    /**鎿嶄綔鍛樺伐鏍囪瘑*/
+    private String staffId;
+    /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+    private String staffRoleId;
+
+    /**鍒犻櫎鐨勫瓙绫绘爣璇�*/
+    private List<String> compareItemList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java
new file mode 100644
index 0000000..8662b16
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java
@@ -0,0 +1,23 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被-鍥剧墖
+ * @author CJH
+ */
+@Data
+public class CompareItemVo {
+
+    /**瀵规瘮鐓�-瀛愯褰曟爣璇�*/
+    private String id;
+    /**绫诲瀷 0鏈墠 1鏈悗 2鍙傝��*/
+    private Integer type;
+    /**瑙掑害绫诲瀷*/
+    private Integer angleType;
+    /**鏂囦欢绫诲瀷锛堝浘鐗�/瑙嗛锛�*/
+    private Integer fileType;
+    /**鍥剧墖/瑙嗛閾炬帴*/
+    private String url;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
new file mode 100644
index 0000000..2ec5658
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
@@ -0,0 +1,51 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+/**
+ * 瀵规瘮鐓у垪琛ㄥ疄浣�
+ */
+@Data
+public class CompareListVo {
+
+    /**褰撳墠椤垫暟*/
+    private Integer pageNum;
+    /**褰撳墠椤垫樉绀烘潯鏁�*/
+    private Integer pageSize;
+
+    /**瀵规瘮鐓ф爣璇�*/
+    private String id;
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
+    /**闋呯洰鏍囪瘑*/
+    private String projectId;
+    /**闋呯洰鍚嶇О*/
+    private String projectName;
+
+    /**鐢ㄦ埛闋呯洰鏍囪瘑*/
+    private String userProjectItemId;
+
+
+
+    public Integer getPageNum() {
+        if(pageNum == null){
+            pageNum = 1;
+        }
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        if(pageSize == null || pageSize > 500){
+            pageSize = 20;
+        }
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java
new file mode 100644
index 0000000..a02212d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java
@@ -0,0 +1,37 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被
+ * @author CJH
+ */
+@Data
+public class CompareVo {
+
+    /**瀵规瘮鐓ф爣璇�*/
+    private String id;
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
+    /**椤圭洰鏍囪瘑*/
+    private String projectId;
+    /**鐢ㄦ埛椤圭洰鏍囪瘑*/
+    private String userProjectItemId;
+    /**鍒掓墸椤圭洰鏍囪瘑*/
+    private String deductionProjectId;
+    /**鍒掓墸鎬昏〃鏍囪瘑*/
+    private String deductionSingleId;
+    /**澶囨敞*/
+    private String remark;
+
+    /**鎿嶄綔鍛樺伐鏍囪瘑*/
+    private String staffId;
+    /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+    private String staffRoleId;
+
+    /**瀛愭暟鎹�*/
+    private List<CompareItemVo> compareItemList;
+
+}

--
Gitblit v1.8.0