Commit bb48d4bf authored by 张宇杰's avatar 张宇杰

修改

parent f3a52e3d
...@@ -585,8 +585,8 @@ public class QuestionnaireCtrl { ...@@ -585,8 +585,8 @@ public class QuestionnaireCtrl {
*/ */
@RequestMapping(value = {"/queryArray"}) @RequestMapping(value = {"/queryArray"})
@ResponseBody @ResponseBody
public void queryArray ( Options options){ public List<Options> queryArray ( Options options){
questionnaireService.queryArray(options); return questionnaireService.queryArray(options);
} }
/** /**
......
...@@ -122,7 +122,7 @@ public interface QuestionnaireDao { ...@@ -122,7 +122,7 @@ public interface QuestionnaireDao {
List<Record> AboutViewListCopy(Record record); List<Record> AboutViewListCopy(Record record);
Integer queryArray (Options options); List<Options> queryArray (Options options);
List<SiteCondition> selectSiteConditionListTemp( List<SiteCondition> selectSiteConditionListTemp(
@Param("recordId") String recordId, @Param("recordId") String recordId,
......
...@@ -140,7 +140,7 @@ public interface QuestionnaireService { ...@@ -140,7 +140,7 @@ public interface QuestionnaireService {
List<Record> AboutViewListCopy(Record record); List<Record> AboutViewListCopy(Record record);
void queryArray(Options options); List<Options> queryArray(Options options);
void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,String createId, void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,String createId,
Integer id1, Integer id2, Integer id3, Integer id1, Integer id2, Integer id3,
......
...@@ -1425,8 +1425,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService { ...@@ -1425,8 +1425,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
} }
@Override @Override
public void queryArray(Options options){ public List<Options> queryArray(Options options){
questionnaireDao.queryArray(options); return questionnaireDao.queryArray(options);
} }
/** /**
......
...@@ -1720,13 +1720,22 @@ ...@@ -1720,13 +1720,22 @@
ORDER BY spaceName; ORDER BY spaceName;
</select> </select>
<select id="queryArray" resultType="java.lang.Integer"> <select id="queryArray" resultType="com.tiptimes.model.Options">
SELECT t_options.id FROM t_options SELECT t_options.id FROM t_options
WHERE t_options.question_id IN WHERE t_options.question_id IN
(SELECT t_questions.id FROM t_questions (SELECT t_questions.id FROM t_questions
WHERE t_questions.questionnaire_uuid = ( WHERE t_questions.questionnaire_uuid = (
SELECT t_questionnaire.id FROM t_questionnaire SELECT t_questionnaire.id FROM t_questionnaire
WHERE t_questionnaire.qn_year = #{qnYear})) WHERE t_questionnaire.qn_year = #{qnYear}))
</select> </select>
<!-- <select id="queryArray" resultType="java.lang.Integer">-->
<!-- SELECT t_options.id FROM t_options-->
<!-- WHERE t_options.question_id IN-->
<!-- (SELECT t_questions.id FROM t_questions-->
<!-- WHERE t_questions.questionnaire_uuid = (-->
<!-- SELECT t_questionnaire.id FROM t_questionnaire-->
<!-- WHERE t_questionnaire.qn_year = #{qnYear}))-->
<!-- </select>-->
</mapper> </mapper>
\ No newline at end of file
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