Commit 9b4f6fdb by hzc

根据任务级别,当前用户id获取历史模板

parent 132eadaf
......@@ -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();
......
......@@ -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);
}
......@@ -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);
}
......@@ -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);
}
}
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment