Commit 88630e0a authored by Asjoker's avatar Asjoker

问卷管理-详情细化

parent d8633e0d
...@@ -204,6 +204,23 @@ public class GoToCtrl { ...@@ -204,6 +204,23 @@ public class GoToCtrl {
return "/education/notice"; return "/education/notice";
} }
@RequestMapping({"/education/questionnaire_information"})
public String getEducationQuestionnaire_information(HttpServletRequest request) {
return "/education/questionnaire_information";
}
@RequestMapping({"/education/questionnaire_Information_list"})
public String getEducationQuestionnaire_information_list(HttpServletRequest request) {
String recordId = request.getParameter("recordId");
request.setAttribute("recordId", recordId);
return "/education/questionnaire_Information_list";
}
@RequestMapping({"/space/questionnaire_information"})
public String getSpaceQuestionnaire_information(HttpServletRequest request) {
return "/space/questionnaire_information";
}
@RequestMapping({"/space/top_teacher"}) @RequestMapping({"/space/top_teacher"})
public String getspacetop_teacher(HttpServletRequest request) { public String getspacetop_teacher(HttpServletRequest request) {
return "/space/top_teacher"; return "/space/top_teacher";
......
package com.tiptimes.ctrl; package com.tiptimes.ctrl;
import com.tiptimes.model.Answer; import com.github.pagehelper.PageInfo;
import com.tiptimes.model.File; import com.tiptimes.model.*;
import com.tiptimes.model.Questionnaire;
import com.tiptimes.model.Record;
import com.tiptimes.model.Review;
import com.tiptimes.service.FileService; import com.tiptimes.service.FileService;
import com.tiptimes.service.QuestionnaireService; import com.tiptimes.service.QuestionnaireService;
import com.tiptimes.util.CompressUtils; import com.tiptimes.util.CompressUtils;
...@@ -24,11 +21,7 @@ import java.io.FileInputStream; ...@@ -24,11 +21,7 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Date; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@Controller @Controller
@RequestMapping({"/questionnaire"}) @RequestMapping({"/questionnaire"})
...@@ -199,12 +192,45 @@ public class QuestionnaireCtrl { ...@@ -199,12 +192,45 @@ public class QuestionnaireCtrl {
@ResponseBody @ResponseBody
public Map<String, Object> selectRecordList(Record record){ public Map<String, Object> selectRecordList(Record record){
List<Record> recordList= this.questionnaireService.selectRecordList(record); List<Record> recordList= this.questionnaireService.selectRecordList(record);
List<Object> object_temp = new ArrayList();
Iterator var10 = recordList.iterator();
while(var10.hasNext()){
Record educationQuestionnaireInformation_list_i = (Record)var10.next();
String html_table = "";
html_table = html_table +"<span style=\"margin-right: 10px;\" class=\"getAllProject_table\" onclick=\"setAllMaterial_detail('" + educationQuestionnaireInformation_list_i.getId() + "')\">查看</span>";
html_table = html_table +"<span style=\"margin-right: 10px;\" class=\"getAllProject_table\" onclick=\"setAllMaterial_edit('" + educationQuestionnaireInformation_list_i.getId() + "')\">审批</span>";
Map<String, Object> map_temp_i = new HashMap();
map_temp_i.put("createBy", educationQuestionnaireInformation_list_i.getCreateBy());
if (educationQuestionnaireInformation_list_i.getWritePeople().equals("")){
map_temp_i.put("writePeople", "暂无");
} else {
map_temp_i.put("writePeople", educationQuestionnaireInformation_list_i.getWritePeople());
}
map_temp_i.put("phoneNumber", educationQuestionnaireInformation_list_i.getPhoneNumber());
if (educationQuestionnaireInformation_list_i.getProcessStatus() == 0){
map_temp_i.put("processStatus","未上报");
} else if (educationQuestionnaireInformation_list_i.getProcessStatus() == 1){
map_temp_i.put("processStatus","待审核");
} else if (educationQuestionnaireInformation_list_i.getProcessStatus() == 2){
map_temp_i.put("processStatus","驳回");
} else {
map_temp_i.put("processStatus","通过");
}
map_temp_i.put("editable", html_table);
object_temp.add(map_temp_i);
}
PageInfo<Record> p = new PageInfo(recordList);
Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
Map<String, Object> data = new HashMap(); map.put("aaData",object_temp);
map.put("result", true);
map.put("msg", ""); map.put("recordsFiltered", p.getList().size());
data.put("recordList",recordList); map.put("iTotalRecords", p.getTotal());
map.put("data",data); map.put("iTotalDisplayRecords", p.getTotal());
return map; return map;
} }
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<select id="selectRecordList" resultType="com.tiptimes.model.Record"> <select id="selectRecordList" resultType="com.tiptimes.model.Record">
SELECT process_status AS 'processStatus',reason,create_by AS 'createBy', SELECT process_status AS 'processStatus',reason,create_by AS 'createBy',
phone_number AS 'phoneNumber',write_people AS 'writePeople' phone_number AS 'phoneNumber',write_people AS 'writePeople',id AS 'id'
FROM t_record FROM t_record
WHERE questionnaire_uuid=#{questionnaireUuid} WHERE questionnaire_uuid=#{questionnaireUuid}
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment