From e212c4201ffb4518c3c5e1a270491ea95ad1217e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 17 四月 2023 18:30:56 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-prod-new-报表工具
---
phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java | 37 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java | 15 +++++++
phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java | 20 ++++++++++
phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java | 21 ++++++++++
phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java | 21 ++++++++++
5 files changed, 114 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
index f347f17..2d77c81 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.activity.ActivityDto;
+import com.hz.phis.dt.reward.QuestionInvestigateDto;
import com.hz.phis.dt.reward.RewardRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +28,18 @@
*/
@PostMapping(value = "/questionnaire/reward")
Result reward(RewardRecordDto recordDto);
+
+
+ /**
+ * 璋冩煡闂嵎璇︽儏
+ */
+ @PostMapping(value = "/questionnaire/investigate/details")
+ Result details(QuestionInvestigateDto questionInvestigateDto);
+
+ /**
+ * 鎻愪氦璋冩煡闂嵎
+ */
+ @PostMapping(value = "/questionnaire/submit")
+ Result submit(QuestionInvestigateDto questionInvestigateDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
new file mode 100644
index 0000000..b05332d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
@@ -0,0 +1,21 @@
+package com.hz.phis.dt.reward;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * @ClassName AwardDto
+ * @Description 璋冩煡闂嵎鎻愪氦鏁版嵁dto
+ * @Author wrh
+ * @Date 2023/4/17 10:46
+ * @Version 1.0
+ */
+@Data
+public class AnswerDto {
+
+ private String code;
+ private String titleId;
+ private String answer;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java
new file mode 100644
index 0000000..67ae7e7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java
@@ -0,0 +1,21 @@
+package com.hz.phis.dt.reward;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName InvestigateGroupDto
+ * @Description 棰樼粍鏁版嵁
+ * @Author wrh
+ * @Date 2023/4/17 11:53
+ * @Version 1.0
+ */
+@Data
+public class InvestigateGroupDto {
+
+ private String awardId;
+ private String groupId;
+ //棰樼洰鏁版嵁
+ private List<InvestigateTitleDto> titleDtoList;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
new file mode 100644
index 0000000..79ecbc4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
@@ -0,0 +1,20 @@
+package com.hz.phis.dt.reward;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName InvestigateTitleDto
+ * @Description 棰樼洰鏁版嵁
+ * @Author wrh
+ * @Date 2023/4/17 11:55
+ * @Version 1.0
+ */
+@Data
+public class InvestigateTitleDto {
+ private String titleId;
+ private String title;
+ private List<String> answerList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
new file mode 100644
index 0000000..a9452d4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
@@ -0,0 +1,37 @@
+package com.hz.phis.dt.reward;
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName QuestionInvestigateDto
+ * @Description 璋冩煡闂嵎dto
+ * @Author wrh
+ * @Date 2023/4/17 10:39
+ * @Version 1.0
+ */
+@Data
+public class QuestionInvestigateDto extends BaseDt {
+
+ private String code;
+
+ private String investigateId;
+
+ private String userId;
+
+ private Integer type;
+
+ private Date startTime;
+
+ private Date doneTime;
+
+ private String proposal;
+
+ //绛旀鏁版嵁
+ private List<AnswerDto> answerDtoList;
+
+ private List<InvestigateGroupDto> investigateGroupDtos;
+}
--
Gitblit v1.8.0