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
9afb654d
Commit
9afb654d
authored
Jun 25, 2023
by
赵桢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导出校验修改
parent
362435cc
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
37 deletions
+38
-37
QuestionnaireCtrl.java
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
+5
-5
QuestionnaireDao.java
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
+1
-1
QuestionnaireService.java
src/main/java/com/tiptimes/service/QuestionnaireService.java
+1
-1
QuestionnaireServiceImpl.java
...a/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
+4
-4
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+27
-26
No files found.
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @
9afb654d
...
...
@@ -562,11 +562,11 @@ public class QuestionnaireCtrl {
* @param record
* @return
*/
@RequestMapping
(
"/CountStratus"
)
@ResponseBody
public
List
<
Record
>
selectRecordList1
(
@RequestBody
Record
record
)
{
return
questionnaireService
.
selectRecordList1
(
record
);
}
//
@RequestMapping("/CountStratus")
//
@ResponseBody
//
public List<Record> selectRecordList1(@RequestBody Record record) {
//
return questionnaireService.selectRecordList1(record);
//
}
/**
*
*
...
...
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
View file @
9afb654d
...
...
@@ -116,7 +116,7 @@ public interface QuestionnaireDao {
List
<
Record
>
AboutViewList
(
Record
record
);
List
<
Record
>
selectRecordList1
(
Record
record
);
//
List<Record> selectRecordList1(Record record);
List
<
Record
>
AboutViewListCopy
(
Record
record
);
...
...
src/main/java/com/tiptimes/service/QuestionnaireService.java
View file @
9afb654d
...
...
@@ -131,7 +131,7 @@ public interface QuestionnaireService {
List
<
Record
>
AboutViewList
(
Record
record
);
List
<
Record
>
selectRecordList1
(
Record
record
);
//
List<Record> selectRecordList1(Record record);
List
<
Record
>
AboutViewListCopy
(
Record
record
);
...
...
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @
9afb654d
...
...
@@ -1394,10 +1394,10 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
return
questionnaireDao
.
AboutViewList
(
record
);
}
@Override
public
List
<
Record
>
selectRecordList1
(
Record
record
)
{
return
questionnaireDao
.
selectRecordList1
(
record
);
}
//
@Override
//
public List<Record> selectRecordList1(Record record) {
//
return questionnaireDao.selectRecordList1(record);
//
}
@Override
public
List
<
Record
>
AboutViewListCopy
(
Record
record
)
{
...
...
src/main/resources/mapper/Questionnaire.xml
View file @
9afb654d
...
...
@@ -1057,31 +1057,31 @@
</where>
ORDER BY create_time DESC
</select>
<select
id=
"selectRecordList1"
resultType=
"com.tiptimes.model.Record"
>
SELECT
process_status as 'processStatus',
reason as 'reason',
create_by as 'createBy',
phone_number as 'phoneNumber',
qn_year as 'qnYear',
write_people as 'writePeople',
id as 'id',
create_time as 'createTime',
questionnaire_uuid as 'questionnaireUuid',
questionnaire_name as 'questionnaireName',
create_id as 'createId'
from t_record
<where
>
t_record.process_status = '3'
<if
test=
"qnYear == null or qnYear == ''"
>
<!-- 年份
-->
AND qn_year = YEAR(NOW())
</if
>
<if
test=
"qnYear != null and qnYear != ''"
>
<!-- 年份
-->
AND qn_year = #{qnYear}
</if
>
</where
>
ORDER BY create_time DESC
</select
>
<!-- <select id="selectRecordList1" resultType="com.tiptimes.model.Record">--
>
<!-- SELECT-->
<!-- process_status as 'processStatus',-->
<!-- reason as 'reason',-->
<!-- create_by as 'createBy',-->
<!-- phone_number as 'phoneNumber',-->
<!-- qn_year as 'qnYear',-->
<!-- write_people as 'writePeople',-->
<!-- id as 'id',-->
<!-- create_time as 'createTime',-->
<!-- questionnaire_uuid as 'questionnaireUuid',-->
<!-- questionnaire_name as 'questionnaireName',-->
<!-- create_id as 'createId'-->
<!-- from t_record-->
<!-- <where>--
>
<!-- t_record.process_status = '3'-->
<!-- <if test="qnYear == null or qnYear == ''"><!– 年份 –>
-->
<!-- AND qn_year = YEAR(NOW())-->
<!-- </if>--
>
<!-- <if test="qnYear != null and qnYear != ''"><!– 年份 –>
-->
<!-- AND qn_year = #{qnYear}-->
<!-- </if>--
>
<!-- </where>--
>
<!-- ORDER BY create_time DESC-->
<!-- </select>--
>
<select
id=
"AboutViewListCopy"
resultType=
"com.tiptimes.model.Record"
>
SELECT
...
...
@@ -1098,7 +1098,8 @@
create_id as 'createId'
from t_record
<where>
(create_id = '0696a85864f34816adf41e7ce363751c')
-- (create_id = '0696a85864f34816adf41e7ce363751c')
create_id = #{createId}
<if
test=
"createBy != null and createBy != ''"
>
AND create_by like concat(concat('%',#{createBy},'%'))
</if>
...
...
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