王子文 专项培养

master/src/main/java/com/ruoyi/project/training/spec/controller/TStPlanController.java

@@ -82,7 +82,7 @@ public class TStPlanController extends BaseController
     private TokenService tokenService;
 
     /**
-     * 培养计划导入
+     * 导入培养计划数据
      *
      * @param file 用户上传的文件
      * @param updateSupport 是否更新支持，如果已存在，则进行更新数据
@@ -98,8 +98,7 @@ public class TStPlanController extends BaseController
         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);
+        String message = tStPlanService.importData(planList, updateSupport, loginUser, yearPlanId);
         return AjaxResult.success(message);
     }
 

master/src/main/java/com/ruoyi/project/training/spec/domain/vo/TStPlanImportTemplateVO.java → master/src/main/java/com/ruoyi/project/training/spec/domain/vo/TStPlanImportVO.java

@@ -13,11 +13,8 @@ import java.util.Date;
  * @email wangggziwen@163.com
  * @date 2022/05/26 13:42:44
  */
-public class TStPlanImportTemplateVO extends BaseEntity
+public class TStPlanImportVO extends BaseEntity
 {
-    @Excel(name = "员工编号")
-    private String staffId;
-
     @Excel(name = "课程内容")
     private String plantName;
 
@@ -29,21 +26,9 @@ public class TStPlanImportTemplateVO extends BaseEntity
     @Excel(name = "结束日期", dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "实际完成日期", dateFormat = "yyyy-MM-dd")
-    private Date dateOfCompletion;
-
     @Excel(name = "具体内容")
     private String classContent;
 
-    public String getStaffId() {
-        return staffId;
-    }
-
-    public void setStaffId(String staffId) {
-        this.staffId = staffId;
-    }
-
     public String getPlantName() {
         return plantName;
     }
@@ -68,14 +53,6 @@ public class TStPlanImportTemplateVO extends BaseEntity
         this.endDate = endDate;
     }
 
-    public Date getDateOfCompletion() {
-        return dateOfCompletion;
-    }
-
-    public void setDateOfCompletion(Date dateOfCompletion) {
-        this.dateOfCompletion = dateOfCompletion;
-    }
-
     public String getClassContent() {
         return classContent;
     }

master/src/main/java/com/ruoyi/project/training/spec/service/ITStPlanService.java

@@ -2,8 +2,11 @@ package com.ruoyi.project.training.spec.service;
 
 import java.util.List;
 
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.training.spec.domain.TStFeedback;
 import com.ruoyi.project.training.spec.domain.TStPlan;
+import com.ruoyi.project.training.spec.domain.vo.TStPlanImportVO;
 
 /**
  * 培训计划Service接口
@@ -74,4 +77,15 @@ public interface ITStPlanService
      * @return 结果
      */
     public int deleteTStPlanById(Long id);
+
+    /**
+     * 导入培养计划数据
+     *
+     * @param planList 培养计划数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param loginUser 操作用户
+     * @param yearPlanId 年度培养计划id
+     * @return 结果
+     */
+    String importData(List<TStPlanImportVO> planList, boolean isUpdateSupport, LoginUser loginUser, Long yearPlanId);
 }

master/src/main/java/com/ruoyi/project/training/spec/service/impl/TStPlanServiceImpl.java

@@ -2,7 +2,13 @@ package com.ruoyi.project.training.spec.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.training.spec.domain.TStFeedback;
+import com.ruoyi.project.training.spec.domain.vo.TStPlanImportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.training.spec.mapper.TStPlanMapper;
@@ -102,4 +108,72 @@ public class TStPlanServiceImpl implements ITStPlanService
     {
         return tStPlanMapper.deleteTStPlanById(id);
     }
+
+    /**
+     * 导入培养计划数据
+     *
+     * @param planList 培养计划数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param loginUser 操作用户
+     * @param yearPlanId 年度培养计划id
+     * @return 结果
+     */
+    @Override
+    public String importData(List<TStPlanImportVO> planList, boolean isUpdateSupport, LoginUser loginUser, Long yearPlanId) {
+//        if (StringUtils.isNull(userList) || userList.size() == 0)
+//        {
+//            throw new CustomException("导入用户数据不能为空！");
+//        }
+//        int successNum = 0;
+//        int failureNum = 0;
+//        StringBuilder successMsg = new StringBuilder();
+//        StringBuilder failureMsg = new StringBuilder();
+//        String password = configService.selectConfigByKey("sys.user.initPassword");
+//        for (SysUser user : userList)
+//        {
+//            try
+//            {
+//                // 验证是否存在这个用户
+//                SysUser u = userMapper.selectUserByUserName(user.getUserName());
+//                if (StringUtils.isNull(u))
+//                {
+//                    user.setPassword(SecurityUtils.encryptPassword(password));
+//                    user.setCreateBy(operName);
+//                    this.insertUser(user);
+//                    successNum++;
+//                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
+//                }
+//                else if (isUpdateSupport)
+//                {
+//                    user.setUpdateBy(operName);
+//                    this.updateUser(user);
+//                    successNum++;
+//                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
+//                }
+//                else
+//                {
+//                    failureNum++;
+//                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
+//                }
+//            }
+//            catch (Exception e)
+//            {
+//                failureNum++;
+//                String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
+//                failureMsg.append(msg + e.getMessage());
+//                log.error(msg, e);
+//            }
+//        }
+//        if (failureNum > 0)
+//        {
+//            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+//            throw new CustomException(failureMsg.toString());
+//        }
+//        else
+//        {
+//            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+//        }
+//        return successMsg.toString();
+        return null;
+    }
 }

ui/src/views/training/spec/plan/index.vue

@@ -285,7 +285,7 @@
                 :limit="1"
                 accept=".xlsx, .xls"
                 :headers="upload.headers"
-                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport + 'yearPlanId=' + queryParams.yearPlanId"
                 :disabled="upload.isUploading"
                 :on-progress="handleFileUploadProgress"
                 :on-success="handleFileSuccess"
@@ -1189,7 +1189,7 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-        this.upload.title = "用户导入";
+        this.upload.title = "导入培养计划数据";
         this.upload.open = true;
     },
     /** 下载模板操作 */