From 7cab9d2bdf1484a81f2d3d7f236eb30d29033c94 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 28 七月 2022 00:10:12 +0800
Subject: [PATCH] 查询员工角色
---
service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
old mode 100644
new mode 100755
index 359d6dd..4ae15f5
--- a/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java
@@ -1,6 +1,8 @@
package com.java110.user.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.questionAnswer.QuestionAnswerDto;
import com.java110.dto.userQuestionAnswer.UserQuestionAnswerDto;
import com.java110.dto.userQuestionAnswerValue.UserQuestionAnswerValueDto;
import com.java110.po.userQuestionAnswer.UserQuestionAnswerPo;
@@ -102,19 +104,34 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
- * @param communityId 灏忓尯ID
+ * @param storeId 灏忓尯ID
* @return
* @serviceCode /userQuestionAnswer/queryUserQuestionAnswer
* @path /app/userQuestionAnswer/queryUserQuestionAnswer
*/
@RequestMapping(value = "/queryUserQuestionAnswer", method = RequestMethod.GET)
- public ResponseEntity<String> queryUserQuestionAnswer(@RequestParam(value = "communityId") String communityId,
+ public ResponseEntity<String> queryUserQuestionAnswer(@RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "roleCd", required = false) String roleCd,
+ @RequestParam(value = "state", required = false) String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
UserQuestionAnswerDto userQuestionAnswerDto = new UserQuestionAnswerDto();
userQuestionAnswerDto.setPage(page);
userQuestionAnswerDto.setRow(row);
- userQuestionAnswerDto.setObjId(communityId);
+ userQuestionAnswerDto.setState(state);
+ if ("owner".equals(roleCd)) {
+ userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
+ userQuestionAnswerDto.setObjId(communityId);
+ userQuestionAnswerDto.setPersonId(userId);
+ userQuestionAnswerDto.setQaTypes(new String[]{"1001", "3003"});
+ } else {
+ userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
+ userQuestionAnswerDto.setObjId(storeId);
+ userQuestionAnswerDto.setPersonId(userId);
+ userQuestionAnswerDto.setQaTypes(new String[]{"2002", "4004"});
+ }
return getUserQuestionAnswerBMOImpl.get(userQuestionAnswerDto);
}
@@ -127,13 +144,34 @@
* @path /app/userQuestionAnswer/saveUserQuestionAnswerValue
*/
@RequestMapping(value = "/saveUserQuestionAnswerValue", method = RequestMethod.POST)
- public ResponseEntity<String> saveUserQuestionAnswerValue(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> saveUserQuestionAnswerValue(
+ @RequestHeader(value = "user-id") String userId,
+ @RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "qaId", "璇锋眰鎶ユ枃涓湭鍖呭惈qaId");
+ Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
+ Assert.hasKeyAndValue(reqJson, "objId", "璇锋眰鎶ユ枃涓湭鍖呭惈objId");
+ Assert.hasKeyAndValue(reqJson, "answerType", "璇锋眰鎶ユ枃涓湭鍖呭惈answerType");
+ Assert.hasKey(reqJson, "questionAnswerTitles", "鏈寘鍚瓟妗�");
+ JSONArray questionAnswerTitles = reqJson.getJSONArray("questionAnswerTitles");
+
+ if (questionAnswerTitles == null || questionAnswerTitles.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚瓟妗�");
+ }
+
+ JSONObject titleObj = null;
+ for (int questionAnswerTitleIndex = 0; questionAnswerTitleIndex < questionAnswerTitles.size(); questionAnswerTitleIndex++) {
+ titleObj = questionAnswerTitles.getJSONObject(questionAnswerTitleIndex);
+ Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("qaTitle") + ",鏈～鍐欑瓟妗�");
+ }
UserQuestionAnswerValuePo userQuestionAnswerValuePo = BeanConvertUtil.covertBean(reqJson, UserQuestionAnswerValuePo.class);
- return saveUserQuestionAnswerValueBMOImpl.save(userQuestionAnswerValuePo);
+
+ userQuestionAnswerValuePo.setPersonId(userId);
+
+
+ return saveUserQuestionAnswerValueBMOImpl.save(userQuestionAnswerValuePo, questionAnswerTitles);
}
/**
--
Gitblit v1.8.0