Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
platform
Commits
70655d9c
Commit
70655d9c
authored
May 29, 2023
by
张宇杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新创SQL
parent
d2d1fd86
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
70 deletions
+19
-70
QuestionnaireCtrl.java
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
+0
-12
QuestionnaireDao.java
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
+0
-2
Questionnaire.java
src/main/java/com/tiptimes/model/Questionnaire.java
+9
-0
Record.java
src/main/java/com/tiptimes/model/Record.java
+1
-1
QuestionnaireService.java
src/main/java/com/tiptimes/service/QuestionnaireService.java
+0
-2
QuestionnaireServiceImpl.java
...a/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
+0
-4
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+9
-49
No files found.
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @
70655d9c
...
@@ -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
...
...
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
View file @
70655d9c
...
@@ -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
);
}
}
src/main/java/com/tiptimes/model/Questionnaire.java
View file @
70655d9c
...
@@ -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
;
}
}
...
...
src/main/java/com/tiptimes/model/Record.java
View file @
70655d9c
...
@@ -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
;
...
...
src/main/java/com/tiptimes/service/QuestionnaireService.java
View file @
70655d9c
...
@@ -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
);
}
}
...
...
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @
70655d9c
...
@@ -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
){
...
...
src/main/resources/mapper/Questionnaire.xml
View file @
70655d9c
...
@@ -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',
create_by as 'createBy',
reason as 'reason',
phone_number as 'phoneNumber',
create_by as 'createBy',
qn_year as 'qnYear',
phone_number as 'phoneNumber',
write_people as 'writePeople',
qn_year as 'qnYear',
id as 'id'
write_people as 'writePeople',
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment