优化加入问卷类型

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

@@ -20,6 +20,7 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
 
     private String qaName;
     private String qaType;
+    private String qaTypeName;
     private String startTime;
     private String endTime;
     private String storeId;
@@ -122,4 +123,12 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
     public void setObjIds(String[] objIds) {
         this.objIds = objIds;
     }
+
+    public String getQaTypeName() {
+        return qaTypeName;
+    }
+
+    public void setQaTypeName(String qaTypeName) {
+        this.qaTypeName = qaTypeName;
+    }
 }

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

@@ -19,8 +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.status_cd,t.status_cd
         statusCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.remark,t.remark
-        storeId,t.obj_type,t.obj_type objType,t.obj_id,t.obj_id objId,t.qa_id,t.qa_id qaId
+        storeId,t.obj_type,t.obj_type objType,t.obj_id,t.obj_id objId,t.qa_id,t.qa_id qaId,td.`name` qaTypeName
         from question_answer t
+        LEFT JOIN t_dict td on td.status_cd = t.qa_type and td.table_name = 'question_answer' and td.table_columns = 'qa_type'
         where 1 =1
         <if test="qaName !=null and qaName != ''">
             and t.qa_name= #{qaName}