Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
Overview
Overview
Details
Activity
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
zhangkb
indicators
Commits
9b4f6fdb
Commit
9b4f6fdb
authored
Jan 15, 2021
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据任务级别,当前用户id获取历史模板
parent
132eadaf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
0 deletions
+45
-0
ExcelTempCtrl.java
...com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java
+6
-0
ExcelTemplateMapper.java
...dicators/model/mapper/indicators/ExcelTemplateMapper.java
+7
-0
ExcelTemplateService.java
...le/indicators/service/dataenter/ExcelTemplateService.java
+7
-0
ExcelTemplateServiceImpl.java
...tors/service/dataenter/impl/ExcelTemplateServiceImpl.java
+11
-0
ExcelTemplateMapper.xml
src/main/resources/mybatis/mapping/ExcelTemplateMapper.xml
+14
-0
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java
View file @
9b4f6fdb
...
...
@@ -286,6 +286,12 @@ public class ExcelTempCtrl {
}
}
@ApiOperation
(
"根据任务级别,当前用户id获取历史模板"
)
@GetMapping
(
"getOldTemp"
)
public
List
<
ExcelTemplate
>
getOldTemp
(
@RequestParam
(
"ruleLevel"
)
String
ruleLevel
){
String
userId
=
SystemUserUtil
.
getCurrentUserId
();
return
excelTemplateService
.
getOldTemp
(
ruleLevel
,
userId
);
}
private
Map
<
String
,
List
<
List
<
String
>>>
getTwoData
(
ExcelTemplate
template
)
{
List
<
ExcelIndicator
>
inds
=
template
.
getInds
();
...
...
src/main/java/com/keymobile/indicators/model/mapper/indicators/ExcelTemplateMapper.java
View file @
9b4f6fdb
...
...
@@ -30,4 +30,11 @@ public interface ExcelTemplateMapper extends BaseMapper<ExcelTemplate> {
* @return
*/
List
<
ExcelTemplate
>
findByRuleTask
(
@Param
(
"ruleId"
)
Integer
ruleId
,
@Param
(
"taskId"
)
String
taskId
);
/**
* 根据用户id和任务级别查询填报模板
* @Param [ruleLevel, userId]
* @Date 2021/1/15 14:32
* @Author hzc
**/
List
<
ExcelTemplate
>
selectByRuleLevelAndUserId
(
String
ruleLevel
,
String
userId
);
}
src/main/java/com/keymobile/indicators/service/dataenter/ExcelTemplateService.java
View file @
9b4f6fdb
...
...
@@ -58,4 +58,11 @@ public interface ExcelTemplateService {
*/
void
delete
(
Integer
id
);
/**
* 根据用户id和任务级别查询填报模板
* @Param [ruleLevel, userId]
* @Date 2021/1/15 14:32
* @Author hzc
**/
List
<
ExcelTemplate
>
getOldTemp
(
String
ruleLevel
,
String
userId
);
}
src/main/java/com/keymobile/indicators/service/dataenter/impl/ExcelTemplateServiceImpl.java
View file @
9b4f6fdb
...
...
@@ -167,4 +167,15 @@ public class ExcelTemplateServiceImpl implements ExcelTemplateService {
excelObjMapper
.
deleteLogisByTempId
(
id
);
excelIndicatorMapper
.
deleteLogisByTempId
(
id
);
}
/**
* 根据用户id和任务级别查询填报模板
* @Param [ruleLevel, userId]
* @Date 2021/1/15 14:32
* @Author hzc
**/
@Override
public
List
<
ExcelTemplate
>
getOldTemp
(
String
ruleLevel
,
String
userId
)
{
return
excelTemplateMapper
.
selectByRuleLevelAndUserId
(
ruleLevel
,
userId
);
}
}
src/main/resources/mybatis/mapping/ExcelTemplateMapper.xml
View file @
9b4f6fdb
...
...
@@ -28,4 +28,17 @@
</if>
order by update_time desc
</select>
<select
id=
"selectByRuleLevelAndUserId"
parameterType=
"java.lang.String"
resultType=
"com.keymobile.indicators.model.entity.dataenter.ExcelTemplate"
>
SELECT *
FROM data_enter_excel_temp
where id in(select max(id) from data_enter_excel_temp group by task_id)
and state = 1
<if
test=
"ruleLevel != null and ruleLevel !=''"
>
and rule_level = #{ruleLevel}
</if>
<if
test=
"userId != null and userId !=''"
>
and creator = #{userId}
</if>
order by update_time desc
</select>
</mapper>
\ No newline at end of file
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