From dc2a5c71ffc4bfd4463294f781bac3eee728e45a Mon Sep 17 00:00:00 2001
From: bianyadong <yadong.bian@coolcollege.cn>
Date: Fri, 17 May 2024 14:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/dao/EmployeeTrainingDAO.java | 8 +++-----
 .../src/main/resources/mapper/EmployeeTrainingMapper.xml  | 7 ++++---
 .../store/service/impl/EmployeeTrainingServiceImpl.java   | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
index 66ecc0f80..e89610718 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
@@ -1,11 +1,9 @@
 package com.cool.store.dao;
 
-import com.cool.store.entity.AssessmentDataDO;
 import com.cool.store.entity.EmployeeTrainingDO;
 import com.cool.store.mapper.EmployeeTrainingMapper;
 import com.cool.store.vo.EmployeeTrainingVO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.entity.Example;
 
@@ -74,17 +72,17 @@ public class EmployeeTrainingDAO {
         statusList.add(2);
         statusList.add(3);
         Example example = new Example(EmployeeTrainingDO.class);
-        example.createCriteria().andCondition("assessment_num = assessment_total_num").andEqualTo("theoretical_exam_status", 0)
+        example.createCriteria().andCondition("assessment_num = assessment_total_num").andEqualTo("theoreticalExamStatus", 0)
                 .andIn("assessmentStatus", statusList);
         return employeeTrainingMapper.selectByExample(example);
     }
 
-    public Integer unCompleteNum() {
+    public Integer unCompleteNum(Long shopId) {
         List<Integer> statusList = new ArrayList<>();
         statusList.add(0);
         statusList.add(1);
         Example example = new Example(EmployeeTrainingDO.class);
-        example.createCriteria().andIn("assessmentStatus", statusList);
+        example.createCriteria().andIn("assessmentStatus", statusList).andEqualTo("shopId", shopId);
         return employeeTrainingMapper.selectCountByExample(example);
     }
 }
diff --git a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
index 89fe5b1a6..8f60a4d2a 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
@@ -128,11 +128,12 @@
         e.practical_assessment_user_id as practicalAssessmentUserId,
         e.assessment_num as assessmentNum,
         e.assessment_total_num as assessmentTotalNum,
-        e.theoretical_exam_status as theoreticalExamStatus,
+        ifnull(e.theoretical_exam_status, 0) as theoreticalExamStatus,
         e.theoretical_exam_score as theoreticalExamScore,
-        e.practical_exam_status as practicalExamStatus,
+        ifnull(e.practical_exam_status,0 ) as practicalExamStatus,
         e.practical_exam_score as practicalExamScore,
-        e.assessment_status as assessmentStatus
+        ifnull(e.assessment_status,0) as assessmentStatus,
+        ifnull(e.assign_flag,0) as assignFlag
         from xfsg_temp_user_detail u
         left join xfsg_employee_training e on e.xfsg_user_detail_id = u.id
         left join xfsg_shop_info s on s.id = u.shop_id
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
index 2135783c0..df7c3b9e0 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
@@ -637,7 +637,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
 
         //查询员工是否全部培训完成
-        Integer unCompleteNum = employeeTrainingDAO.unCompleteNum();
+        Integer unCompleteNum = employeeTrainingDAO.unCompleteNum(tempUserDetailDO.getShopId());
         if (unCompleteNum != null && unCompleteNum == 0) {
             // 培训全部结束