Commit 70655d9c authored by 张宇杰's avatar 张宇杰

新创SQL

parent d2d1fd86
...@@ -484,18 +484,6 @@ public class QuestionnaireCtrl { ...@@ -484,18 +484,6 @@ public class QuestionnaireCtrl {
return questionnaireService.selectRecordList(record); return questionnaireService.selectRecordList(record);
} }
/**
* 查询
* @param record
* @return
*/
@RequestMapping(value = {"/JackList"})
@ResponseBody
public List<Record> ListListT(Record record) {
return questionnaireService.JackList(record);
}
/** /**
* 查询问卷管理列表 * 查询问卷管理列表
* @param record * @param record
......
...@@ -107,6 +107,4 @@ public interface QuestionnaireDao { ...@@ -107,6 +107,4 @@ public interface QuestionnaireDao {
List<Review> selectReviewListByRecordId(@Param("recordId") Long recordId); List<Review> selectReviewListByRecordId(@Param("recordId") Long recordId);
List<Record> AboutViewList(Record record); List<Record> AboutViewList(Record record);
List<Record> JackList(Record record);
} }
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
public class Questionnaire {//问卷相关数据返回Vo public class Questionnaire {//问卷相关数据返回Vo
private Long id;//问卷id private Long id;//问卷id
private String questionnaireUuid;
private String questionnaireName;//问卷名称 private String questionnaireName;//问卷名称
private int status;//问卷状态 1:启用(默认值);0:停用' private int status;//问卷状态 1:启用(默认值);0:停用'
private String createBy;//创建者 private String createBy;//创建者
...@@ -17,6 +18,14 @@ public class Questionnaire {//问卷相关数据返回Vo ...@@ -17,6 +18,14 @@ public class Questionnaire {//问卷相关数据返回Vo
private Integer qnYear; //上报年份 private Integer qnYear; //上报年份
private List<Review>reviewList;//审核备注 private List<Review>reviewList;//审核备注
public String getQuestionnaireUuid() {
return questionnaireUuid;
}
public void setQuestionnaireUuid(String questionnaireUuid) {
this.questionnaireUuid = questionnaireUuid;
}
public String getWritePeople() { public String getWritePeople() {
return writePeople; return writePeople;
} }
......
...@@ -138,7 +138,7 @@ public class Record {//上报记录表 ...@@ -138,7 +138,7 @@ public class Record {//上报记录表
this.questionnaireUuid = questionnaireUuid; this.questionnaireUuid = questionnaireUuid;
this.questionnaireName = questionnaireName; this.questionnaireName = questionnaireName;
this.processStatus = processStatus; this.processStatus = processStatus;
this.writePeople=writePeople; this.writePeople = writePeople;
this.phoneNumber = phoneNumber; this.phoneNumber = phoneNumber;
this.createBy = createBy; this.createBy = createBy;
this.createTime = createTime; this.createTime = createTime;
......
...@@ -120,8 +120,6 @@ public interface QuestionnaireService { ...@@ -120,8 +120,6 @@ public interface QuestionnaireService {
Map<String,Object> generateRecordTask(); Map<String,Object> generateRecordTask();
List<Record> JackList(Record record);
List<Record> AboutViewList(Record record); List<Record> AboutViewList(Record record);
} }
......
...@@ -1292,10 +1292,6 @@ public class QuestionnaireServiceImpl implements QuestionnaireService { ...@@ -1292,10 +1292,6 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
return tblMap; return tblMap;
} }
} }
@Override
public List<Record> JackList(Record record) {
return questionnaireDao.JackList(record);
}
@Override @Override
public List<Record> AboutViewList(Record record){ public List<Record> AboutViewList(Record record){
......
...@@ -636,16 +636,17 @@ ...@@ -636,16 +636,17 @@
</select> </select>
<select id="AboutViewList" resultType="com.tiptimes.model.Record"> <select id="AboutViewList" resultType="com.tiptimes.model.Record">
SELECT process_status as 'processStatus', SELECT
reason, process_status as 'processStatus',
reason as 'reason',
create_by as 'createBy', create_by as 'createBy',
phone_number as 'phoneNumber', phone_number as 'phoneNumber',
qn_year as 'qnYear', qn_year as 'qnYear',
write_people as 'writePeople', write_people as 'writePeople',
id as 'id' id as 'id',
create_time as 'createTime'
from t_record from t_record
<where> <where>
questionnaire_uuid="1"
<if test="createBy != null and createBy != ''"> <if test="createBy != null and createBy != ''">
AND create_by like concat(concat('%',#{createBy},'%')) AND create_by like concat(concat('%',#{createBy},'%'))
</if> </if>
...@@ -655,50 +656,9 @@ ...@@ -655,50 +656,9 @@
<if test="qnYear != null and qnYear != ''"><!-- 年份 --> <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
AND qn_year = #{qnYear} AND qn_year = #{qnYear}
</if> </if>
</where>
ORDER BY create_time DESC
</select>
<select id="JackList" resultType="com.tiptimes.model.Record">
SELECT * from t_record
<where>
<if test="id != null and id != ''">
AND id = #{idd}
</if>
<if test="reason != null and reason != ''">
AND reason = #{reason}
</if>
<if test="createTime != null"> <if test="createTime != null">
AND create_time = #{createTime} AND create_time = #{createTime}
</if> </if>
<if test="writePeople != null and writePeople != ''">
AND write_people = #{writePeople}
</if>
<if test="phoneNumber != null and phoneNumber != ''">
AND phone_number = #{phoneNumber}
</if>
<if test="questionnaireUuid != null and questionnaireUuid != ''">
AND questionnaire_uuid = #{questionnaireUuid}
</if>
<if test="createBy != null and createBy != ''">
AND create_by like concat(concat('%',#{createBy},'%'))
</if>
<if test="processStatus != null"><!-- 问卷状态 -->
AND process_status = #{processStatus}
</if>
<if test="qnYear != null and qnYear != ''"><!-- 年份 -->
AND qn_year = #{qnYear}
</if>
<if test="writePeople != null and writePeople != ''"><!-- 年份 -->
AND write_people = #{writePeople}
</if>
<if test="createId != null and createId != ''"><!-- 年份 -->
AND create_id = #{createId}
</if>
<if test="questionnaireName != null and questionnaireName != ''"><!-- 年份 -->
AND questionnaire_name = #{questionnaireName}
</if>
</where> </where>
ORDER BY create_time DESC ORDER BY create_time DESC
......
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