From e09e3c40e9acf5bac969c829a942d6c1e532a895 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 24 八月 2023 15:30:18 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-订单升单
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java | 4
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/feign/service/platform/bi/BiOpeStaService.java | 12 ++
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 +++
9 files changed, 330 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
index 0dfd38e..fa28a2e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
@@ -18,12 +18,12 @@
Result empSourceList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
/*** 鍜ㄨ甯�-璇勫垎鍒楄〃-瀵煎嚭 */
- @PostMapping("/admin/consultant/report/emp/source/export")
+ @PostMapping("/admin/consultant/report/source/emp/source/export")
Result empSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
/*** 鍜ㄨ甯�-鎺掑悕-瀵煎嚭 */
- @PostMapping("/admin/consultant/report/shop/emp/source/export")
+ @PostMapping("/admin/consultant/report/source/shop/emp/source/export")
Result shopEmpSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
index d42e81e..9a0db20 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -82,6 +82,12 @@
@PostMapping("/admin/operational/channels/deal")
Result channelsDeal(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-娓犻亾鎬讳俊鎭�-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/channels/deal/export")
+ Result channelsDealExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
/**
* 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-鏂板獟浣撴矇鐫″娓犻亾鐜伴噾涓氱哗
@@ -96,6 +102,12 @@
Result shopChannels(@RequestBody OperationalStatementsVo operationalStatementsVo);
/**
+ * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-闂ㄨ瘖鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/shop/channels/export")
+ Result shopChannelsExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
* 闂ㄥ簵&鍜ㄨ甯堣�佸甫鏂伴澶╂垚浜ら噾棰濆垎鏋�
*/
@PostMapping("/admin/operational/shop/consultant/deal-analysis")
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 鏄姹傛帴鍙ｅ墠缂�
+ * @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