From d9516cee011ee0a24dbd18d48ed634fd703d6c22 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 22 Oct 2020 18:01:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=80=83=E8=AF=84?=
 =?UTF-8?q?=E7=BB=84=E4=BF=A1=E6=81=AF=E6=97=B6=E8=BF=94=E5=9B=9Edepartmen?=
 =?UTF-8?q?t=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/dto/DepartmentsSimpleDto.java |  2 +-
 .../controller/FlowStartController.java       | 23 ++++++++++++-------
 .../mapper/flow/StaffRoleDepartmentMapper.xml |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java b/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java
index 583438e5..ca9ccf74 100644
--- a/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java
+++ b/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java
@@ -21,7 +21,7 @@ public class DepartmentsSimpleDto implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "部门id", name = "id")
-    private Integer id;
+    private String id;
     /**
      * 飞书显示部门人数
      */
diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
index d92fc494..63d1a382 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
@@ -9,6 +9,8 @@ import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.flow.entity.*;
 import com.lz.modules.flow.service.*;
+import com.lz.modules.sys.entity.app.ResultDetail;
+import com.lz.modules.sys.entity.app.ResultRecord;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -90,6 +92,7 @@ public class FlowStartController {
               ) {
              //下面初始化员工考核流程
              List<String> staffIds = evaluationGroupService.selectAllStaffIdsByGroupId(evaluationGroup.getId());
+
              if(staffIds.size() == 0){
                  return R.error(evaluationGroup.getName() + "——无有效考核人员");
              }
@@ -104,6 +107,9 @@ public class FlowStartController {
                  return R.error(evaluationGroup.getName() + "——没有设置考核流程");
              }
 
+             List<ResultRecord> resultRecords = new ArrayList<>();
+             List<ResultDetail> resultDetails = new ArrayList<>();
+
              List<EvaluationStartStaff> evaluationStartStaffs = new ArrayList<>();
              //下面初始化参与人员
              for (String staffId:staffIds
@@ -115,6 +121,14 @@ public class FlowStartController {
                  evaluationStartStaff.setType(CheckStaffType.STAFF.getCode());
                  evaluationStartStaffs.add(evaluationStartStaff);
 
+
+                 for (ResultModel resultModel:resultModels
+                      ) {
+                     ResultRecord resultRecord = new ResultRecord();
+
+                 }
+
+
              }
              if(evaluationStartStaffs.size() == 0){
 
@@ -188,16 +202,9 @@ public class FlowStartController {
                 if(flowApprovalRoles.size() > 0){
                     flowApprovalRoleService.insertFlowApprovalRoles(flowApprovalRoles);
                 }
-
-                for (EvaluationStartStaff startStaff:evaluationStartStaffs
-                     ) {
-                    if(startStaff.getType().intValue() == CheckStaffType.STAFF.getCode()){
-                        //初始化人员及流程表id
-                    }
+                //下面初始化lz_result_record表和lz_result_detail表
 
 
-
-                }
             }
 
 
diff --git a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
index 88d725d8..b438fa15 100644
--- a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
+++ b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml
@@ -113,7 +113,7 @@
 
     <select id="selectDepartmentSimpleInfos"
             resultType="com.lz.modules.app.dto.DepartmentsSimpleDto">
-        select id, member_count, department_name from lz_departments  where is_delete = 0
+        select department_id as id, member_count, department_name from lz_departments  where is_delete = 0
         and department_id in
         <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
             #{item}

From 6a5f7c63e429d0798da5dade5817b3695b26f8cc Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 23 Oct 2020 09:07:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/performance/controller/FlowStartController.java   | 4 ++++
 .../performance/service/impl/AssessManagerServiceImpl.java    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
index 63d1a382..ed7c0c73 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java
@@ -93,6 +93,8 @@ public class FlowStartController {
              //下面初始化员工考核流程
              List<String> staffIds = evaluationGroupService.selectAllStaffIdsByGroupId(evaluationGroup.getId());
 
+
+
              if(staffIds.size() == 0){
                  return R.error(evaluationGroup.getName() + "——无有效考核人员");
              }
@@ -107,7 +109,9 @@ public class FlowStartController {
                  return R.error(evaluationGroup.getName() + "——没有设置考核流程");
              }
 
+             //初始化lz_result_records数据
              List<ResultRecord> resultRecords = new ArrayList<>();
+             //初始化lz_result_details数据
              List<ResultDetail> resultDetails = new ArrayList<>();
 
              List<EvaluationStartStaff> evaluationStartStaffs = new ArrayList<>();
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index 226d51bf..cf82a717 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -15,6 +15,7 @@ import com.lz.modules.sys.entity.app.ResultRecord;
 import com.sun.org.apache.regexp.internal.RE;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
  * @Desc:
  * @Date: 2020/10/22 17:28
  */
+@Service
 public class AssessManagerServiceImpl implements AssessManagerService {
     @Autowired
     private FlowStartMapper flowStartMapper;