问卷管理-详情细化

src/main/resources/mapper/Questionnaire.xml

@@ -105,10 +105,10 @@
 		FROM t_record
 		WHERE questionnaire_uuid=#{questionnaireUuid}
 		<if test="createBy != null and createBy != ''">
-			AND create_by = #{createBy}
+			AND create_by like concat(concat('%',#{createBy},'%'))
 		</if>
-		<if test="processStatus != null and processStatus != ''"><!-- 开始时间 -->
-			AND process_status #{processStatus}
+		<if test="processStatus != null and processStatus != ''"><!-- 问卷状态 -->
+			AND process_status = #{processStatus}
 		</if>
 	</select>
 

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

@@ -34,11 +34,18 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
             <div class="col-sm-12">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
-                          <span style="font-size: 20px;">素材库<span id="material_class_title"></span></span>
-                           <a href="<%=request.getContextPath()%>/goto/education/material_Information"><button class="btn btn-sm btn-primary pull-right m-t-n-xs" ><strong>新建素材</strong></button></a>
+                          <span style="font-size: 20px;">问卷管理<span id="material_class_title"></span></span>
                     </div>
                     <div class="ibox-content">
                         <div class="form-inline pull-right  ">
+                            <label class="control-label">填报状态：</label>
+                            <select class="form-control" id="processStatus" style="margin-right: 15px;width: 196px">
+                                <option value="">——请选择——</option>
+                                <option value="0">未上报</option>
+                                <option value="1">待审核</option>
+                                <option value="2">已驳回</option>
+                                <option value="3">已通过</option>
+                            </select>
                             <input type="text" id="title" class="form-control" placeholder="众创空间" />
                             <button style="margin-top: 5px" class=" btn btn-sm btn-primary  m-t-n-xs" onclick="search();">搜 索</button>
                         </div>

src/main/webapp/res/js/education/questionnaire_Information.js

@@ -459,13 +459,20 @@ function img_DIV_List_Show() {
 	for(var file_i in tempImgList) {
 		prehtml += "<div>";
 		prehtml += "<div class=\"col-sm-8\">";
-		prehtml += '<img src="'+tempImgList[file_i].date+'" width="150px" height="100px" style="margin-left: 15px" />';
+		prehtml += '<img src="'+tempImgList[file_i].value+'" width="150px" height="100px" />';
+		prehtml += "<label onclick=\"previews('"+tempImgList[file_i].value+"')\">预览</label>";
+		prehtml += "<label onclick=\"file_DIV_delete_8('"+tempImgList[file_i].group+"')\" style='margin-left: 15px'>删除</label>";
 		prehtml += "</div>";
 		prehtml += "</div>";
 	}
 	$("#file_DIV_List_Show_8").html(prehtml);
 }
 
+// 图片预览
+function previews(url) {
+	window.open(`${window.location.origin}${url}`)
+}
+
 function saveQuestionnaire(){
 	$(document).ready(function () {
 		var rejectReason = ''
@@ -495,6 +502,7 @@ function saveQuestionnaire(){
 		async:false,
 		contentType:'application/json;charset=UTF-8',
 		success : function(result) {
+			swal("成功！", '暂存成功', "error");
 		}
 	});
 }

src/main/webapp/res/js/education/questionnaire_Information_list.js

@@ -6,11 +6,18 @@ var oTable;
 var page_start=0;
 function search() {
     var title= $("#title").val();
-    searchMessage(title);
+    var processStatus = $("#processStatus").val();
+    searchMessage(title,processStatus);
 }
-function searchMessage(title) {
-
+function searchMessage(title, status) {
+	if (title !== null && title !== ''){
 		var url=webroot+"questionnaire/selectRecordList?questionnaireUuid=1&createBy="+title;
+	} else if (status !== null && status !== ''){
+		var url=webroot+"questionnaire/selectRecordList?questionnaireUuid=1&processStatus="+status;
+	} else {
+		var url=webroot+"questionnaire/selectRecordList?questionnaireUuid=1&createBy="+title+"&processStatus="+status;
+	}
+
 	$('#hidden-table-info').DataTable().ajax.url(url).load();
 }
 
@@ -42,6 +49,7 @@ function testListApi() {
 			"ajax": {  //ajax方式向后台发送请求
 				"type": "POST",
 				"url": url,
+				"content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
 				"dataType": "json"
 			},
 			"columns": [

src/main/webapp/res/js/space/questionnaire_Information.js

@@ -524,8 +524,9 @@ function img_DIV_List_Show() {
 	for(var file_i in tempImgList) {
 		prehtml += "<div>";
 		prehtml += "<div class=\"col-sm-8\">";
-		prehtml += '<img src="'+tempImgList[file_i].date+'" width="150px" height="100px" style="margin-left: 15px" />';
-		prehtml += "<label onclick=\"file_DIV_delete_8('"+tempImgList[file_i].group+"')\">删除</label>";
+		prehtml += '<img src="'+tempImgList[file_i].value+'" width="150px" height="100px" />';
+		prehtml += "<label onclick=\"previews('"+tempImgList[file_i].value+"')\">预览</label>";
+		prehtml += "<label onclick=\"file_DIV_delete_8('"+tempImgList[file_i].group+"')\" style='margin-left: 15px'>删除</label>";
 		prehtml += "</div>";
 		prehtml += "</div>";
 	}
@@ -627,6 +628,7 @@ function getSaveData() {
 }
 
 function saveQuestionnaire(type){
+	formData = [];
 	$(document).ready(function () {
 		$('input[name*="option_"]').each(function () {
 			if ($(this).val()) {
@@ -733,6 +735,11 @@ function submitQuestionnaire() {
 	}
 }
 
+// 图片预览
+function previews(url) {
+	window.open(`${window.location.origin}${url}`)
+}
+
 // 多文件上传
 var file_list=new Array();
 var file_list_update_id=1;