Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -17,14 +17,21 @@

			<!-- 查询答卷信息 add by wuxw 2018-07-03 -->
			<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.obj_type,t.obj_type objType,t.obj_id,t.obj_id objId,t.qa_id,t.qa_id qaId,td.`name` qaTypeName
			<if test="userId !=null and userId != ''">
			,uqa.person_id userId
			</if>
			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'
			<if test="userId !=null and userId != ''">
			LEFT JOIN user_question_answer uqa on t.qa_id = uqa.qa_id and uqa.status_cd = '0' and uqa.person_id = #{userId}
			</if>
			where 1 =1
			<if test="qaName !=null and qaName != ''">
			and t.qa_name= #{qaName}
			and t.qa_name like concat('%',#{qaName},'%')
			</if>
			<if test="qaType !=null and qaType != ''">
			and t.qa_type= #{qaType}
			@@ -104,7 +111,7 @@
			from question_answer t
			where 1 =1
			<if test="qaName !=null and qaName != ''">
			and t.qa_name= #{qaName}
			and t.qa_name like concat('%',#{qaName},'%')
			</if>
			<if test="qaType !=null and qaType != ''">
			and t.qa_type= #{qaType}