更新

src/main/java/com/keymobile/rest/controller/ExcelController.java

@@ -85,26 +85,26 @@ public class ExcelController {
         int nrOfActiveInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfActiveInstances").toString());
         // 已经完成的会签任务数量
         int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
-
-//        if (nrOfCompletedInstances == nrOfInstances - 1) {
-//            if (template.getNeedConfirm() == Template.NEED_CONFIRM) {
-//                vars.put("NeedConfirm", true);
-//                vars.put("manager", "审核人");
-//            } else {
-//                vars.put("NeedConfirm", false);
+        Activity activity = process.getActivity();
+
+        if (nrOfCompletedInstances == nrOfInstances - 1) {
+            if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
+                vars.put("NeedConfirm", true);
+                vars.put("manager", "审核人");
+            } else {
+                vars.put("NeedConfirm", false);
 //                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
 //                    vars.put("NeedDataBack", true);
 //                    vars.put("backFlowUser", "数据回流人");
 //                } else {
-//                    vars.put("NeedDataBack", false);
-//                    // 流程完
-//                    Activity activity = process.getActivity();
-//                    activity.setStatus(Activity.STATUS_WAIT);
-//                    activityService.save(activity);
+                vars.put("NeedDataBack", false);
+                // 流程完
 //                }
-//            }
-//            taskService.complete(task.getId(), vars);
-//        }
+            }
+            activity.setStatus(Activity.STATUS_WAIT);
+            activityService.save(activity);
+        }
+        taskService.complete(task.getId(), vars);
 
         return "成功";
     }

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -6,7 +6,7 @@ import com.keymobile.rest.common.utils.BeanUti;
 import com.keymobile.rest.common.utils.DateUtil;
 import com.keymobile.rest.common.validator.CommonValidator;
 import com.keymobile.rest.controller.constant.TaskConstant;
-import com.keymobile.rest.dto.LoginUser;
+import com.keymobile.rest.dto.User;
 import com.keymobile.rest.model.*;
 import com.keymobile.rest.model.Process;
 import com.keymobile.rest.service.*;
@@ -72,15 +72,16 @@ public class TaskController {
     })
     @GetMapping(value = "/tasks")
     public SimplePage getTaskList(int pageNo, int pageSize, String name) {
-        Page<Activity> taskList;
+        Page<Activity> page;
         String orderBy = "descending"; //
         String propBy = "id"; // groupBy
         if (name != null) {
-            taskList = activityService.findAllByName(name, pageNo, pageSize, orderBy, propBy);
+            page = activityService.findAllByName(name, pageNo, pageSize, orderBy, propBy);
         } else {
-            taskList = activityService.findAll(pageNo, pageSize, orderBy, propBy);
+            page = activityService.findAll(pageNo, pageSize, orderBy, propBy);
         }
-        return SimplePage.of(taskList);
+        SimpleTask.convert(page.getContent());
+        return SimplePage.of(page);
     }
 
     @ApiOperation(value = "获取单个活动详情")
@@ -97,7 +98,7 @@ public class TaskController {
     @ApiOperation(value = "获取我的任务", notes = "任务列表")
     @GetMapping(value = "/task/getMyTasks")
     public List<Mission> getMyMissions() {
-        LoginUser user = sessionService.getLoginUser();
+        User user = sessionService.getLoginUser();
         CommonValidator.notNull(user, "用户不存在");
         String username = user.getName();
         List<Mission> missions = new ArrayList<>();
@@ -139,10 +140,13 @@ public class TaskController {
         CommonValidator.notEmpty(form.getName(), "名称不能为空");
         CommonValidator.notNull(form.getType(), "类型不能为空");
         CommonValidator.isTrue(form.getExcels() != null && form.getExcels().size() != 0, "补录模板不能为空");
+        CommonValidator.isTrue(form.getNeedConfirm() != null && form.getNeedConfirm() != 0, "needConfirm不能为空");
 
         // 新建活动
         Activity activity = new Activity();
         activity = BeanUti.convertTo(form, activity);
+        User admin = sessionService.getUserByName(TaskConstant.USER_NAME_ADMIN);
+        activity.setUserId(admin.getId());
         activity.setCreateAt(DateUtil.getTimestamp());
         activity.setStatus(Activity.STATUS_WAIT);
         final Activity finalActivity = activityService.save(activity);
@@ -155,7 +159,6 @@ public class TaskController {
 //            CommonValidator.isTrue(excelForm.getScopeId() != null && excelForm.getScopeId() != 0, "模板scopeId不能为空");
             CommonValidator.isTrue(excelForm.getUserIdList() != null && excelForm.getUserIdList().size() != 0, "模板用户idList不能为空");
             CommonValidator.isTrue(excelForm.getNeedAudit() != null && excelForm.getNeedAudit() != 0, "模板needAudit不能为空");
-            CommonValidator.isTrue(excelForm.getNeedConfirm() != null && excelForm.getNeedConfirm() != 0, "模板needConfirm不能为空");
 
             CommonValidator.isFalse((StringUtils.isEmpty(excelForm.getUpStreamAddr()) && StringUtils.isNotEmpty(excelForm.getBackStreamAddr())
                     || (StringUtils.isNotEmpty(excelForm.getUpStreamAddr()) && StringUtils.isEmpty(excelForm.getBackStreamAddr()))), "上游地址和回流地址需同时填写或者同时为空");
@@ -320,4 +323,5 @@ public class TaskController {
                 .missionType(missionType);
         return builder.build();
     }
+
 }

src/main/java/com/keymobile/rest/controller/constant/TaskConstant.java

@@ -19,4 +19,8 @@ public interface TaskConstant {
     String MISSION_TEXT_DATA_AUDIT = "审核补录数据";
     String MISSION_TEXT_MANAGER_AUDIT = "负责人审核";
     String MISSION_TEXT_DATA_BACK_FLOW = "数据回流";
+
+
+    String USER_NAME_ADMIN = "admin";
+    String USER_NAME_MANAGER = "负责人";
 }

src/main/java/com/keymobile/rest/dto/ExcelForm.java

@@ -36,9 +36,6 @@ public class ExcelForm {
     @ApiModelProperty(name = "needAudit", value = "需要审核 1 不需要 2 需要", required = true, example = "1")
     private Integer needAudit = 1;
 
-    @ApiModelProperty(name = "needConfirm", value = "需要负责人确认 1 不需要 2 需要", required = true, example = "1")
-    private Integer needConfirm = 1;
-
     @ApiModelProperty(name = "needMerge", value = "需要数据合并 1 不需要 2 需要", example = "1")
     private Integer needMerge = 1;
 

src/main/java/com/keymobile/rest/dto/TaskForm.java

@@ -20,6 +20,9 @@ public class TaskForm {
     @ApiModelProperty(name = "freq", value = "频度 按年 1 按周 2 按月 3 按日 4", example = "1")
     private Integer freq;
 
+    @ApiModelProperty(name = "needConfirm", value = "需要负责人确认 1 不需要 2 需要", required = true, example = "1")
+    private Integer needConfirm = 1;
+
     @ApiModelProperty(name = "remark", value = "收数描述")
     private String remark;
 

src/main/java/com/keymobile/rest/dto/LoginUser.java → src/main/java/com/keymobile/rest/dto/User.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 @Data
 @Builder
-public class LoginUser {
+public class User {
     private long id;
     private String name;
 }

src/main/java/com/keymobile/rest/service/FeignAuthService.java

@@ -33,6 +33,10 @@ public interface FeignAuthService {
     @GetMapping("/userById")
     Map getUserById(@RequestParam("id") long id);
 
+    @GetMapping("/user")
+    Map getUserByName(@RequestParam("name") String name);
+
+
     /**
      * 获取所有用户组
      * domainId 默认为0L

src/main/java/com/keymobile/rest/service/SessionService.java

 package com.keymobile.rest.service;
 
-import com.keymobile.rest.dto.LoginUser;
+import com.keymobile.rest.dto.User;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
+import javax.xml.ws.soap.Addressing;
+import java.util.Map;
+
 
 @Service
 public class SessionService {
 
-    public LoginUser getLoginUser() {
+    @Autowired
+    private FeignAuthService feignAuthService;
+
+    public User getLoginUser() {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         String userName = "NO_USER";
         if (auth != null) {
             userName = auth.getName();
             String[] info = userName.split(":");
-            return LoginUser.builder().id(Long.parseLong(info[1])).name(info[2]).build();
+            return User.builder().id(Long.parseLong(info[1])).name(info[2]).build();
         } else {
             return null;
         }
     }
 
+    public User getUserByName(String name) {
+        Map user = feignAuthService.getUserByName(name);
+        if (user == null) {
+            return null;
+        } else {
+            return User.builder().id(Long.parseLong(user.get("id").toString())).name(user.get("name").toString()).build();
+        }
+    }
+
 }