教育培训任务代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskEditDto.java

@@ -1,6 +1,5 @@
 package com.xunmei.common.core.domain.edu.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
@@ -53,19 +52,19 @@ public class CoreEduTrainingTaskEditDto {
     private Date dateTime;
 
 
-    @TableField("content")
     @ApiModelProperty(value = "内容")
     private String content;
 
 
-    @TableField("note")
     @ApiModelProperty(value = "总结")
     private String note;
 
-    @TableField("image_list")
     @ApiModelProperty(value = "图片")
     private String imageList;
 
+    @ApiModelProperty(value = "提交类型", notes = "1:暂存,2:提交")
+    private Integer submitType;
+
 
     @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
     private List<CoreEduTrainingTaskToUser> taskUserList;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingTaskController.java

@@ -2,6 +2,7 @@ package com.xunmei.core.edu.controller;
 
 
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
@@ -69,7 +70,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     @RequiresPermissions("core:eduTask:edit")
     @Log(title = "教育任务", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CoreEduTrainingTask coreEduTrainingTask) {
+    public AjaxResult edit(@RequestBody CoreEduTrainingTaskEditDto coreEduTrainingTask) {
         return toAjax(coreEduTrainingTaskService.updateCoreEduTrainingTask(coreEduTrainingTask));
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ICoreEduTrainingTaskService.java

@@ -3,6 +3,7 @@ package com.xunmei.core.edu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
@@ -49,7 +50,7 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
      * @param coreEduTrainingTask 教育任务
      * @return 结果
      */
-    int updateCoreEduTrainingTask(CoreEduTrainingTask coreEduTrainingTask);
+    int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto coreEduTrainingTask);
 
     /**
      * 批量删除教育任务

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -12,6 +12,7 @@ import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.edu.domain.*;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
@@ -20,14 +21,17 @@ import com.xunmei.common.core.enums.edu.EduTrainingDoStatus;
 import com.xunmei.common.core.enums.edu.EduTrainingType;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToRoleMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToUserMapper;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskToRoleService;
+import com.xunmei.core.edu.service.ICoreEduTrainingTaskToUserService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -55,6 +59,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private CoreEduTrainingTaskToRoleMapper taskToRoleMapper;
     @Autowired
     private CoreEduTrainingTaskToUserMapper taskToUserMapper;
+    @Autowired
+    private ICoreEduTrainingTaskToUserService coreEduTrainingTaskToUserService;
 
     @Override
     public TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto request) {
@@ -126,11 +132,23 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     /**
      * 修改教育任务
      *
-     * @param coreEduTrainingTask 教育任务
+     * @param request 教育任务
      * @return 结果
      */
     @Override
-    public int updateCoreEduTrainingTask(CoreEduTrainingTask coreEduTrainingTask) {
+    public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
+        CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
+        BeanUtils.copyProperties(request, coreEduTrainingTask);
+
+        List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
+        if (taskUserList != null && taskUserList.size() > 0) {
+            coreEduTrainingTaskToUserService.saveBatch(taskUserList);
+        }
+        if (ObjectUtil.equal(request.getSubmitType(), 2)) {
+            coreEduTrainingTask.setStatus(EduTrainingDoStatus.WAIT_SIGN.getCode());
+        }
+
+        coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());
         return coreEduTrainingTaskMapper.updateById(coreEduTrainingTask);
     }