优化

java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerValueDto.java

@@ -23,6 +23,8 @@ public class UserQuestionAnswerValueDto extends PageDto implements Serializable
     private String userTitleId;
     private String qaId;
 
+    private String qaValue;
+
 
     private Date createTime;
 
@@ -101,4 +103,12 @@ public class UserQuestionAnswerValueDto extends PageDto implements Serializable
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getQaValue() {
+        return qaValue;
+    }
+
+    public void setQaValue(String qaValue) {
+        this.qaValue = qaValue;
+    }
 }

java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml

@@ -19,10 +19,9 @@
     <select id="getQuestionAnswerInfo" parameterType="Map" resultType="Map">
         select t.qa_name,t.qa_name qaName,t.qa_type,t.qa_type qaType,t.start_time,t.start_time
         startTime,t.remark,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.content,t.qa_id,t.qa_id qaId,t.create_time createTime,t.state,count(uqa1.user_qa_id) voteCount,count(uqa2.user_qa_id) votedCount
+        communityId,t.content,t.qa_id,t.qa_id qaId,t.create_time createTime,t.state,count(uqa1.user_qa_id) voteCount
         from question_answer t
         left join user_question_answer uqa1 on t.qa_id = uqa1.qa_id and uqa1.status_cd = '0'
-        left join user_question_answer uqa2 on t.qa_id = uqa2.qa_id and uqa2.status_cd = '0' and uqa2.state = '1202'
         where 1 =1
         <if test="qaName !=null and qaName != ''">
             and t.qa_name= #{qaName}

java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml

@@ -167,6 +167,9 @@
             and t.status_cd = '0'
             and t.community_id = #{communityId}
             and t.link = #{link}
+            <if test="state != null and state != ''">
+                and t.state = #{state}
+            </if>
             and qa.qa_type = #{qaType}
             and qa.state = 'C'
             and qa.start_time &lt; NOW()

java110-db/src/main/resources/mapper/user/UserQuestionAnswerValueV1ServiceDaoImplMapper.xml

@@ -28,8 +28,9 @@
         select t.value_id,t.value_id valueId,t.title_id,t.title_id titleId,t.user_qa_id,t.user_qa_id
         userQaId,t.value_content,t.value_content valueContent,t.status_cd,t.status_cd
         statusCd,t.community_id,t.community_id communityId,t.user_title_id,t.user_title_id userTitleId,t.qa_id,t.qa_id
-        qaId
+        qaId,qtv.qa_value qaValue
         from user_question_answer_value t
+        left join question_title_value qtv on t.value_id = qtv.value_id and qtv.status_cd = '0'
         where 1 =1
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}

service-user/src/main/java/com/java110/user/cmd/question/ListOwnerVoteCmd.java

@@ -91,16 +91,20 @@ public class ListOwnerVoteCmd extends Cmd {
             return;
         }
         List<QuestionTitleValueDto> values = null;
+        long votedCount = 0;
         for (QuestionAnswerDto tmpQuestionAnswerDto : questionAnswerDtos) {
             values = new ArrayList<>();
+            votedCount = 0;
             for (QuestionTitleValueDto tmpQuestionTitleValueDto : questionTitleValueDtos) {
                 if (!tmpQuestionTitleValueDto.getQaId().equals(tmpQuestionAnswerDto.getQaId())) {
                     continue;
                 }
                 values.add(tmpQuestionTitleValueDto);
                 tmpQuestionAnswerDto.setTitleType(tmpQuestionTitleValueDto.getTitleType());
+                votedCount += tmpQuestionTitleValueDto.getPersonCount();
             }
             tmpQuestionAnswerDto.setTitleValues(values);
+            tmpQuestionAnswerDto.setVotedCount(votedCount);
         }
     }
 }

service-user/src/main/java/com/java110/user/cmd/question/QueryOwnerQuestionAnswerCmd.java

@@ -49,6 +49,7 @@ public class QueryOwnerQuestionAnswerCmd extends Cmd {
         userQuestionAnswerDto.setLink(userDtos.get(0).getTel());
         userQuestionAnswerDto.setCommunityId(reqJson.getString("communityId"));
         userQuestionAnswerDto.setQaType(reqJson.getString("qaType"));
+        userQuestionAnswerDto.setState(reqJson.getString("state"));
         List<QuestionAnswerDto> questionAnswerDtos = userQuestionAnswerV1InnerServiceSMOImpl.queryOwnerQuestionAnswers(userQuestionAnswerDto);
         context.setResponseEntity(ResultVo.createResponseEntity(questionAnswerDtos));
     }