feat: 企业提交任务

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDeptTaskServiceImpl.java

@@ -57,6 +57,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveEntTaskForTaskType61(DeptTaskDTO.TaskType61 params) {
+        String taskTypeId = "61";
 
 //        // 查询任务类型启用状态
 //        List<WmTaskSubmissionPercentRule> rules = wmTaskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
@@ -80,7 +81,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         // 保存taskContent
         WmTaskContent taskContent = new WmTaskContent();
         // 任务类型
-        taskContent.setTemp30("61");
+        taskContent.setTemp30(taskTypeId);
         // 积分包id
         taskContent.setTemp32(params.getPackageId());
         // 主题
@@ -101,7 +102,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         wmTaskContentService.save(taskContent);
 
         // 保存企业任务通用方法
-        this.saveEntTaskCommon(taskContent, params.getScore(), scorePackage);
+        this.saveEntTaskCommon(taskTypeId, taskContent, params.getScore(), scorePackage);
 
         return Boolean.TRUE;
     }
@@ -115,6 +116,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveEntTaskForTaskType62(DeptTaskDTO.TaskType62 params) {
+        String taskTypeId = "62";
 
 //        // 查询任务类型启用状态
 //        List<WmTaskSubmissionPercentRule> rules = wmTaskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
@@ -133,7 +135,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         // 查询任务规则积分
         WmTaskType wmTaskType = new WmTaskType();
         wmTaskType.setRuleId(scorePackage.getRuleId());
-        WmTaskType queryTaskType = wmTaskTypeService.getById("62");
+        WmTaskType queryTaskType = wmTaskTypeService.getById(taskTypeId);
         wmTaskType.setTaskTypeName(queryTaskType.getTaskTypeName());
         int score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
 
@@ -144,7 +146,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         // 保存taskContent
         WmTaskContent taskContent = new WmTaskContent();
         // 任务类型
-        taskContent.setTemp30("62");
+        taskContent.setTemp30(taskTypeId);
         // 积分包id
         taskContent.setTemp32(params.getPackageId());
         // 主题
@@ -173,7 +175,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         wmTaskContentService.save(taskContent);
 
         // 保存企业任务通用方法
-        this.saveEntTaskCommon(taskContent, score, scorePackage);
+        this.saveEntTaskCommon(taskTypeId, taskContent, score, scorePackage);
 
         return Boolean.TRUE;
     }
@@ -186,6 +188,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
      */
     @Override
     public Boolean saveEntTaskForTaskType63(DeptTaskDTO.TaskType63 params) {
+        String taskTypeId = "63";
 
 //        // 查询任务类型启用状态
 //        List<WmTaskSubmissionPercentRule> rules = wmTaskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
@@ -204,7 +207,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         // 查询任务规则积分
         WmTaskType wmTaskType = new WmTaskType();
         wmTaskType.setRuleId(scorePackage.getRuleId());
-        WmTaskType queryTaskType = wmTaskTypeService.getById("63");
+        WmTaskType queryTaskType = wmTaskTypeService.getById(taskTypeId);
         wmTaskType.setTaskTypeName(queryTaskType.getTaskTypeName());
         int score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
 
@@ -215,7 +218,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         // 保存taskContent
         WmTaskContent taskContent = new WmTaskContent();
         // 任务类型
-        taskContent.setTemp30("63");
+        taskContent.setTemp30(taskTypeId);
         // 积分包id
         taskContent.setTemp32(params.getPackageId());
         // 主题
@@ -244,7 +247,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         wmTaskContentService.save(taskContent);
 
         // 保存企业任务通用方法 TODO 初始化企业任务类型
-        this.saveEntTaskCommon(taskContent, score, scorePackage);
+        this.saveEntTaskCommon(taskTypeId, taskContent, score, scorePackage);
 
         return Boolean.TRUE;
     }
@@ -252,11 +255,12 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
     /**
      * 保存企业任务通用方法
      *
+     * @param taskTypeId  任务类型id
      * @param taskContent  任务内容
      * @param taskScore    任务积分
      * @param scorePackage 积分包
      */
-    private void saveEntTaskCommon(WmTaskContent taskContent, int taskScore, WmScorePackage scorePackage) {
+    private void saveEntTaskCommon(String taskTypeId, WmTaskContent taskContent, int taskScore, WmScorePackage scorePackage) {
         HnqzUser user = SecurityUtils.getUser();
         LocalDateTime now = LocalDateTime.now();
 
@@ -264,7 +268,7 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
         WmTask task = new WmTask();
         task.setTaskContentId(String.valueOf(taskContent.getId()));
         task.setTaskFrom("1");
-        task.setTaskTypeId("61");
+        task.setTaskTypeId(taskTypeId);
         task.setTaskUserId(String.valueOf(user.getId()));
         task.setScorePackageId(scorePackage.getId());
         task.setScore(taskScore);