|
@@ -9,8 +9,10 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.github.stuxuhai.jpinyin.PinyinFormat;
|
|
|
import com.github.stuxuhai.jpinyin.PinyinHelper;
|
|
|
import com.ruoyi.common.sendEmail.IMailService;
|
|
|
-import com.ruoyi.common.thread.Trainning.PlanApproveMailThread;
|
|
|
import com.ruoyi.common.thread.Trainning.PlanStudyMailThread;
|
|
|
+import com.ruoyi.common.utils.ServletUtils;
|
|
|
+import com.ruoyi.framework.security.LoginUser;
|
|
|
+import com.ruoyi.framework.security.service.TokenService;
|
|
|
import com.ruoyi.project.system.domain.SysMessage;
|
|
|
import com.ruoyi.project.system.domain.SysUser;
|
|
|
import com.ruoyi.project.system.service.ISysMessageService;
|
|
@@ -19,11 +21,10 @@ import com.ruoyi.project.training.spec.domain.TStFeedback;
|
|
|
import com.ruoyi.project.training.spec.domain.TStSuccessor;
|
|
|
import com.ruoyi.project.training.spec.domain.TStYearplan;
|
|
|
import com.ruoyi.project.training.spec.domain.vo.TStPlanExportVO;
|
|
|
-import com.ruoyi.project.training.spec.domain.vo.TStPlanImportTemplateVO;
|
|
|
+import com.ruoyi.project.training.spec.domain.vo.TStPlanImportVO;
|
|
|
import com.ruoyi.project.training.spec.mapper.TStSuccessorMapper;
|
|
|
import com.ruoyi.project.training.spec.service.ITStSuccessorService;
|
|
|
import com.ruoyi.project.training.spec.service.ITStYearplanService;
|
|
|
-import org.apache.velocity.util.ArrayListWrapper;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -42,6 +43,7 @@ import com.ruoyi.framework.web.controller.BaseController;
|
|
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
import com.ruoyi.framework.web.page.TableDataInfo;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
@@ -76,14 +78,40 @@ public class TStPlanController extends BaseController
|
|
|
@Autowired
|
|
|
private ISysMessageService sysMessageService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TokenService tokenService;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 培养计划导入
|
|
|
+ *
|
|
|
+ * @param file 用户上传的文件
|
|
|
+ * @param updateSupport 是否更新支持,如果已存在,则进行更新数据
|
|
|
+ * @param yearPlanId 年度计划id
|
|
|
+ * @return
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
+ @Log(title = "培训计划", businessType = BusinessType.IMPORT)
|
|
|
+ @PreAuthorize("@ss.hasPermi('spec:plan:add')")
|
|
|
+ @PostMapping("/importData")
|
|
|
+ public AjaxResult importData(MultipartFile file, boolean updateSupport, Long yearPlanId) throws Exception
|
|
|
+ {
|
|
|
+ ExcelUtil<TStPlanImportVO> util = new ExcelUtil<TStPlanImportVO>(TStPlanImportVO.class);
|
|
|
+ List<TStPlanImportVO> planList = util.importExcel(file.getInputStream());
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
+ String operName = loginUser.getUsername();
|
|
|
+ String message = tStPlanService.importUser(planList, updateSupport, operName, yearPlanId);
|
|
|
+ return AjaxResult.success(message);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 下载培养计划导入模板
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/importTemplate")
|
|
|
public AjaxResult importTemplate()
|
|
|
{
|
|
|
- ExcelUtil<TStPlanImportTemplateVO> util = new ExcelUtil<TStPlanImportTemplateVO>(TStPlanImportTemplateVO.class);
|
|
|
+ ExcelUtil<TStPlanImportVO> util = new ExcelUtil<TStPlanImportVO>(TStPlanImportVO.class);
|
|
|
return util.importTemplateExcel("培养计划数据");
|
|
|
}
|
|
|
|