|
|
|
|
@ -2,16 +2,10 @@ package org.jeecg.modules.skillPoints.controller; |
|
|
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
import java.io.IOException; |
|
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
|
import java.net.URLDecoder; |
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
|
import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
|
import org.jeecg.common.util.oConvertUtils; |
|
|
|
|
import org.jeecg.modules.skillPoints.entity.SkillPoints; |
|
|
|
|
import org.jeecg.modules.skillPoints.service.ISkillPointsService; |
|
|
|
|
|
|
|
|
|
@ -20,18 +14,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil; |
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams; |
|
|
|
|
import org.jeecgframework.poi.excel.entity.ImportParams; |
|
|
|
|
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; |
|
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest; |
|
|
|
|
import org.springframework.web.servlet.ModelAndView; |
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog; |
|
|
|
|
@ -86,6 +72,7 @@ public class SkillPointsController extends JeecgController<SkillPoints, ISkillPo |
|
|
|
|
List<SkillPoints> list = skillPointsService.list(new QueryWrapper<SkillPoints>().lambda().orderByDesc(SkillPoints::getSkillCode)); |
|
|
|
|
SkillPoints skillPoints1 = list.get(0); |
|
|
|
|
if (skillPoints1 == null){ |
|
|
|
|
// 编码格式 J+顺序号 共10个字符 ，如果数据库获取不到，则用默认值
|
|
|
|
|
code = "J000000001"; |
|
|
|
|
}else { |
|
|
|
|
Integer s = Integer.valueOf(skillPoints1.getSkillCode().substring(1)) + 1; |
|
|
|
|
|
