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
429bdb33
Commit
429bdb33
authored
Jun 20, 2023
by
张宇杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
b6dd9ebb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
7 deletions
+22
-7
QuestionnaireCtrl.java
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
+9
-5
QuestionnaireDao.java
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
+2
-0
QuestionnaireService.java
src/main/java/com/tiptimes/service/QuestionnaireService.java
+2
-2
QuestionnaireServiceImpl.java
...a/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
+5
-0
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+4
-0
No files found.
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @
429bdb33
...
...
@@ -13,10 +13,7 @@ import org.apache.commons.lang.StringUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -581,9 +578,16 @@ public class QuestionnaireCtrl {
return
questionnaireService
.
AboutViewListCopy
(
record
);
}
// ,method = RequestMethod.GET
@RequestMapping
(
value
=
{
"/{realID}"
})
@ResponseBody
public
Record
AboutViewCopyVo
(
@PathVariable
(
"realID"
)
Integer
realID
)
{
return
questionnaireService
.
AboutViewListCopyVo
(
realID
);
}
@RequestMapping
(
value
=
{
"/AboutViewCopys"
})
@ResponseBody
public
Long
AboutViewCopys
(
@
RequestBody
Questionnaire
questionnaire
,
HttpServletRequest
request
)
{
public
Long
AboutViewCopys
(
@
PathVariable
(
"realID"
)
Questionnaire
questionnaire
,
HttpServletRequest
request
)
{
Long
recordId
=
this
.
questionnaireService
.
selectRecordId
(
questionnaire
.
getId
(),
request
.
getSession
().
getAttribute
(
"realID"
).
toString
());
return
recordId
;
...
...
src/main/java/com/tiptimes/dao/QuestionnaireDao.java
View file @
429bdb33
...
...
@@ -120,6 +120,8 @@ public interface QuestionnaireDao {
List
<
Record
>
AboutViewListCopy
(
Record
record
);
Record
AboutViewListCopyVo
(
@Param
(
"realID"
)
Integer
realID
);
List
<
SiteCondition
>
selectSiteConditionListTemp
(
@Param
(
"recordId"
)
String
recordId
,
@Param
(
"qnYear"
)
Integer
qnYear
,
...
...
src/main/java/com/tiptimes/service/QuestionnaireService.java
View file @
429bdb33
...
...
@@ -5,8 +5,6 @@ import com.tiptimes.model.PerformanceSummary;
import
com.tiptimes.model.Record
;
import
com.tiptimes.model.Review
;
import
com.tiptimes.model.YearId
;
import
com.tiptimes.model.exportDTO.SiteCondition
;
import
org.springframework.data.annotation.Id
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -137,6 +135,8 @@ public interface QuestionnaireService {
List
<
Record
>
AboutViewListCopy
(
Record
record
);
Record
AboutViewListCopyVo
(
Integer
realID
);
void
exportFullTimeWorkPersonNew
(
HttpServletRequest
request
,
HttpServletResponse
response
,
String
index
,
String
recordId
,
Integer
qnYear
,
Integer
id1
,
Integer
id2
,
Integer
id3
,
Integer
id9
,
Integer
id10
,
Integer
id11
,
Integer
id12
,
Integer
id13
,
Integer
id14
,
...
...
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @
429bdb33
...
...
@@ -1404,6 +1404,11 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
return
questionnaireDao
.
AboutViewListCopy
(
record
);
}
@Override
public
Record
AboutViewListCopyVo
(
Integer
realID
)
{
return
questionnaireDao
.
AboutViewListCopyVo
(
realID
);
}
/**
* 2023年修改导出问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据
*
...
...
src/main/resources/mapper/Questionnaire.xml
View file @
429bdb33
...
...
@@ -1117,6 +1117,10 @@
ORDER BY create_time DESC
</select>
<select
id=
"AboutViewListCopyVo"
resultType=
"com.tiptimes.model.Record"
>
select * from t_record where create_id =#{realID}
</select>
<!-- 问卷管理-导出基础指标1 众创空间场地情况、是否租赁场地(新)-->
<select
id=
"selectSiteConditionListTemp"
resultType=
"com.tiptimes.model.exportDTO.SiteCondition"
>
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