Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/Questionnaire.xml

src/main/resources/mapper/Questionnaire.xml

@@ -1057,31 +1057,31 @@
         </where>
         ORDER BY create_time DESC
     </select>
-<!--    <select id="selectRecordList1" resultType="com.tiptimes.model.Record">-->
-<!--        SELECT-->
-<!--        process_status as 'processStatus',-->
-<!--        reason as 'reason',-->
-<!--        create_by as 'createBy',-->
-<!--        phone_number as 'phoneNumber',-->
-<!--        qn_year as 'qnYear',-->
-<!--        write_people as 'writePeople',-->
-<!--        id as 'id',-->
-<!--        create_time as 'createTime',-->
-<!--        questionnaire_uuid as 'questionnaireUuid',-->
-<!--        questionnaire_name as 'questionnaireName',-->
-<!--        create_id as 'createId'-->
-<!--        from t_record-->
-<!--        <where>-->
-<!--            t_record.process_status = '3'-->
-<!--            <if test="qnYear == null or qnYear == ''">&lt;!&ndash; 年份 &ndash;&gt;-->
-<!--                AND qn_year = YEAR(NOW())-->
-<!--            </if>-->
-<!--            <if test="qnYear != null and qnYear != ''">&lt;!&ndash; 年份 &ndash;&gt;-->
-<!--                AND qn_year = #{qnYear}-->
-<!--            </if>-->
-<!--        </where>-->
-<!--        ORDER BY create_time DESC-->
-<!--    </select>-->
+    <select id="selectRecordList1" resultType="com.tiptimes.model.Record">
+        SELECT
+        process_status as 'processStatus',
+        reason as 'reason',
+        create_by as 'createBy',
+        phone_number as 'phoneNumber',
+        qn_year as 'qnYear',
+        write_people as 'writePeople',
+        id as 'id',
+        create_time as 'createTime',
+        questionnaire_uuid as 'questionnaireUuid',
+        questionnaire_name as 'questionnaireName',
+        create_id as 'createId'
+        from t_record
+        <where>
+            t_record.process_status = '3'
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
+        ORDER BY create_time DESC
+    </select>
 
     <select id="AboutViewListCopy" resultType="com.tiptimes.model.Record">
         SELECT
@@ -1098,7 +1098,6 @@
         create_id as 'createId'
         from t_record
         <where>
---         (create_id = '0696a85864f34816adf41e7ce363751c')
             create_id = #{createId}
             <if test="createBy != null and createBy != ''">
                 AND create_by like concat(concat('%',#{createBy},'%'))
@@ -1116,6 +1115,15 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="AboutCopy" resultType="com.tiptimes.model.Record">
+        SELECT
+        write_people as 'writePeople',
+        create_id as 'createId'
+        from t_record
+        where create_id = #{createId}
+
+    </select>
+
     <!-- 问卷管理-导出基础指标1 众创空间场地情况、是否租赁场地(新)-->
     <select id="selectSiteConditionListTemp" resultType="com.tiptimes.model.exportDTO.SiteCondition">
         SELECT *

src/main/webapp/WEB-INF/page/education/questionnaire_Administration_Tnew.jsp

@@ -102,7 +102,7 @@
         var url = "http://localhost:8081/#/one?session="+session+"&realID="+createId;
         <%--var url = "http://localhost:8081/#/one?session=<%=request.getAttribute("SESSION")%>"--%>
         // 创建 iframe
-        alert(url)
+        // alert(url)
         var iframe = $('<iframe width="100%" height="100%" src="' + url + '"></iframe>');
 
         // 将 iframe 添加到页面中