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
56c43e9b
Commit
56c43e9b
authored
Jun 19, 2023
by
赵桢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
默认列表
parent
f6a465a1
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
73 additions
and
27 deletions
+73
-27
QuestionnaireCtrl.java
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
+7
-0
QuestionnaireDao.java
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
+4
-0
QuestionnaireService.java
src/main/java/com/tiptimes/service/QuestionnaireService.java
+3
-0
QuestionnaireServiceImpl.java
...a/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
+32
-26
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+27
-1
No files found.
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @
56c43e9b
...
...
@@ -560,6 +560,11 @@ public class QuestionnaireCtrl {
return
questionnaireService
.
AboutViewList
(
record
);
}
@RequestMapping
(
"/CountStratus"
)
@ResponseBody
public
List
<
Record
>
selectRecordList1
(
@RequestBody
Record
record
)
{
return
questionnaireService
.
selectRecordList1
(
record
);
}
/**
* 查询问卷管理列表
*
...
...
@@ -587,6 +592,8 @@ public class QuestionnaireCtrl {
return
map
;
}
/**
* 2023导出修改为动态传值
*
...
...
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
View file @
56c43e9b
...
...
@@ -45,6 +45,8 @@ public interface QuestionnaireDao {
List
<
YearId
>
selectQnYearId
(
@Param
(
"qnYear"
)
Integer
qnYear
);
Record
selectById
(
Long
recordId
);
List
<
Record
>
selectRecordList
(
Record
record
);
...
...
@@ -114,6 +116,8 @@ public interface QuestionnaireDao {
List
<
Record
>
AboutViewList
(
Record
record
);
List
<
Record
>
selectRecordList1
(
Record
record
);
List
<
Record
>
AboutViewListCopy
(
Record
record
);
List
<
SiteCondition
>
selectSiteConditionListTemp
(
...
...
src/main/java/com/tiptimes/service/QuestionnaireService.java
View file @
56c43e9b
...
...
@@ -86,6 +86,7 @@ public interface QuestionnaireService {
*/
List
<
YearId
>
selectQnYearId
(
Integer
qnYear
);
/**
*根据记录id查询评审备注详情
* @param recordId 记录id
...
...
@@ -132,6 +133,8 @@ public interface QuestionnaireService {
List
<
Record
>
AboutViewList
(
Record
record
);
List
<
Record
>
selectRecordList1
(
Record
record
);
List
<
Record
>
AboutViewListCopy
(
Record
record
);
void
exportFullTimeWorkPersonNew
(
HttpServletRequest
request
,
HttpServletResponse
response
,
String
index
,
String
recordId
,
Integer
qnYear
,
...
...
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @
56c43e9b
This diff is collapsed.
Click to expand it.
src/main/resources/mapper/Questionnaire.xml
View file @
56c43e9b
...
...
@@ -122,7 +122,7 @@
FROM t_record
LEFT JOIN t_answer on t_record.id = t_answer.record_id
<where>
(t_answer.options_id != '' or t_answer.options_id != null)
(t_answer.options_id != '' or t_answer.options_id != null)
<if
test=
"qnYear == null or qnYear == ''"
>
<!-- 年份 -->
AND t_record.qn_year = YEAR(NOW())
</if>
...
...
@@ -132,6 +132,7 @@
</where>
GROUP BY options_id
</select>
<select
id=
"selectById"
resultType=
"com.tiptimes.model.Record"
>
SELECT process_status AS 'processStatus',reason, create_by AS 'createBy',phone_number AS 'phoneNumber'
FROM t_record
...
...
@@ -1056,6 +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=
"AboutViewListCopy"
resultType=
"com.tiptimes.model.Record"
>
SELECT
...
...
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