优化代码

java110-bean/src/main/java/com/java110/dto/questionAnswer/QuestionAnswerDto.java

@@ -18,6 +18,8 @@ import java.util.List;
 public class QuestionAnswerDto extends PageDto implements Serializable {
 
     public static final String QA_TYPE_VOTE = "3003";// 业主投票
+    public static final String STATE_WAIT = "W"; // 待发布
+    public static final String STATE_COMPLETE = "C"; //发布完成
 
     private String qaName;
     private String qaType;
@@ -40,6 +42,8 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
 
     private List<QuestionTitleValueDto> titleValues;
 
+    private String state;
+
     public String getQaName() {
         return qaName;
     }
@@ -152,4 +156,12 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
     public void setTitleType(String titleType) {
         this.titleType = titleType;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-bean/src/main/java/com/java110/po/questionAnswer/QuestionAnswerPo.java

@@ -17,6 +17,7 @@ package com.java110.po.questionAnswer;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-07-13 00:03:56 mail: 928255095@qq.com
@@ -28,69 +29,94 @@ import java.util.Date;
 public class QuestionAnswerPo implements Serializable {
 
     private String qaName;
-private String qaType;
-private String startTime;
-private String remark;
-private String statusCd = "0";
-private String endTime;
-private String communityId;
-private String content;
-private String qaId;
-public String getQaName() {
+    private String qaType;
+    private String startTime;
+    private String remark;
+    private String statusCd = "0";
+    private String endTime;
+    private String communityId;
+    private String content;
+    private String qaId;
+
+    private String state;
+
+    public String getQaName() {
         return qaName;
     }
-public void setQaName(String qaName) {
+
+    public void setQaName(String qaName) {
         this.qaName = qaName;
     }
-public String getQaType() {
+
+    public String getQaType() {
         return qaType;
     }
-public void setQaType(String qaType) {
+
+    public void setQaType(String qaType) {
         this.qaType = qaType;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getContent() {
+
+    public String getContent() {
         return content;
     }
-public void setContent(String content) {
+
+    public void setContent(String content) {
         this.content = content;
     }
-public String getQaId() {
+
+    public String getQaId() {
         return qaId;
     }
-public void setQaId(String qaId) {
+
+    public void setQaId(String qaId) {
         this.qaId = qaId;
     }
 
+    public String getState() {
+        return state;
+    }
 
-
+    public void setState(String state) {
+        this.state = state;
+    }
 }

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

@@ -8,9 +8,9 @@
     <!-- 保存问卷投票信息 add by wuxw 2018-07-03 -->
     <insert id="saveQuestionAnswerInfo" parameterType="Map">
         insert into question_answer(
-        qa_name,qa_type,start_time,remark,end_time,community_id,content,qa_id
+        qa_name,qa_type,start_time,remark,end_time,community_id,content,qa_id,state
         ) values (
-        #{qaName},#{qaType},#{startTime},#{remark},#{endTime},#{communityId},#{content},#{qaId}
+        #{qaName},#{qaType},#{startTime},#{remark},#{endTime},#{communityId},#{content},#{qaId},#{state}
         )
     </insert>
 
@@ -19,7 +19,7 @@
     <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,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,count(uqa2.user_qa_id) votedCount
         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'
@@ -51,7 +51,10 @@
         <if test="qaId !=null and qaId != ''">
             and t.qa_id= #{qaId}
         </if>
-        group by t.qa_name,t.qa_type,t.start_time,t.remark,t.status_cd,t.end_time,t.community_id,t.content,t.qa_id,t.create_time
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        group by t.qa_name,t.qa_type,t.start_time,t.remark,t.status_cd,t.end_time,t.community_id,t.content,t.qa_id,t.create_time,t.state
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -81,8 +84,8 @@
         <if test="endTime !=null and endTime != ''">
             , t.end_time= #{endTime}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
         </if>
         <if test="content !=null and content != ''">
             , t.content= #{content}
@@ -91,6 +94,9 @@
         <if test="qaId !=null and qaId != ''">
             and t.qa_id= #{qaId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
@@ -126,6 +132,9 @@
         <if test="qaId !=null and qaId != ''">
             and t.qa_id= #{qaId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
 
 
     </select>

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

@@ -115,6 +115,7 @@ public class SaveOwnerVoteCmd extends Cmd {
         questionAnswerPo.setQaName(reqJson.getString("qaName"));
         questionAnswerPo.setCommunityId(reqJson.getString("communityId"));
         questionAnswerPo.setQaType(QuestionAnswerDto.QA_TYPE_VOTE);
+        questionAnswerPo.setState(QuestionAnswerDto.STATE_WAIT);
         questionAnswerV1InnerServiceSMOImpl.saveQuestionAnswer(questionAnswerPo);
 
         QuestionAnswerTitleRelPo questionAnswerTitleRelPo = new QuestionAnswerTitleRelPo();