员工培训

coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java

@@ -63,9 +63,10 @@ public class EmployeeTrainingDAO {
     public List<EmployeeTrainingVO> assessmentUserList(String name, String practicalAssessmentUserId,
                                                        Integer assessmentStatus,
                                                        String estimatedAssessmentBeginTime, String estimatedAssessmentEndTime,
-                                                       String actualAssessmentBeginTime, String actualAssessmentEndTime) {
+                                                       String actualAssessmentBeginTime, String actualAssessmentEndTime, List<String> storeIdList,
+                                                       List<String> authRegionIdList) {
         return employeeTrainingMapper.assessmentUserList(name, practicalAssessmentUserId, assessmentStatus, estimatedAssessmentBeginTime,
-                estimatedAssessmentEndTime, actualAssessmentBeginTime, actualAssessmentEndTime);
+                estimatedAssessmentEndTime, actualAssessmentBeginTime, actualAssessmentEndTime, storeIdList, authRegionIdList);
     }
 
     public List<EmployeeTrainingDO> theoreticalList() {

coolstore-partner-dao/src/main/java/com/cool/store/mapper/EmployeeTrainingMapper.java

@@ -12,12 +12,12 @@ import java.util.List;
 public interface EmployeeTrainingMapper extends Mapper<EmployeeTrainingDO> {
 
     List<EmployeeTrainingVO> employeeTrainingList(@Param("keyWord") String keyWord, @Param("regionIdList") List<String> regionIdList,
-                                                    @Param("authRegionIdList") List<String> authRegionIdList, @Param("assignFlag") Boolean assignFlag,
+                                                  @Param("authRegionIdList") List<String> authRegionIdList, @Param("assignFlag") Boolean assignFlag,
-                                                    @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("storeNumList") List<String> storeNumList,
+                                                  @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("storeNumList") List<String> storeNumList,
-                                                    @Param("theoreticalExamStatus") Integer theoreticalExamStatus,
+                                                  @Param("theoreticalExamStatus") Integer theoreticalExamStatus,
-                                                    @Param("practicalExamStatus") Integer practicalExamStatus,
+                                                  @Param("practicalExamStatus") Integer practicalExamStatus,
-                                                    @Param("assessmentStatus") Integer assessmentStatus,
+                                                  @Param("assessmentStatus") Integer assessmentStatus,
-                                                    @Param("assignStoreFlag") Boolean assignStoreFlag);
+                                                  @Param("assignStoreFlag") Boolean assignStoreFlag);
 
     List<EmployeeTrainingVO> trainingListByShopId(@Param("shopId") Long shopId, @Param("trainingTeacherUserId") String trainingTeacherUserId,
                                                   @Param("status") Integer status);
@@ -25,6 +25,6 @@ public interface EmployeeTrainingMapper extends Mapper<EmployeeTrainingDO> {
     List<EmployeeTrainingVO> assessmentUserList(@Param("name") String name, @Param("practicalAssessmentUserId") String practicalAssessmentUserId,
                                                 @Param("assessmentStatus") Integer assessmentStatus,
                                                 @Param("estimatedAssessmentBeginTime") String estimatedAssessmentBeginTime, @Param("estimatedAssessmentEndTime") String estimatedAssessmentEndTime,
-                                                @Param("actualAssessmentBeginTime") String actualAssessmentBeginTime, @Param("actualAssessmentEndTime") String actualAssessmentEndTime
+                                                @Param("actualAssessmentBeginTime") String actualAssessmentBeginTime, @Param("actualAssessmentEndTime") String actualAssessmentEndTime,
-                                                );
+                                                @Param("storeIdList") List<String> storeIdList, @Param("authRegionIdList") List<String> authRegionIdList);
 }

coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml

@@ -195,5 +195,17 @@
         <if test="name != null and name != ''">
             and u.username like concat('%',#{name},'%')
         </if>
+        <if test="storeIdList != null and storeIdList.size() > 0">
+            and e.training_store_id in
+            <foreach collection="storeIdList" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="authRegionIdList != null and authRegionIdList.size() > 0">
+            and u.region_id in
+            <foreach collection="authRegionIdList" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 </mapper>

coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java

@@ -91,6 +91,13 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         if (!sysRoleService.checkIsAdmin(userId)) {
             authRegionIdList = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
         }
+        if (CollectionUtils.isNotEmpty(request.getRegionIdList())) {
+            if (request.getRegionIdList().contains(CommonConstants.ROOT_DEPT_ID_STR)) {
+                request.setRegionIdList(null);
+            } else {
+                request.setRegionIdList(regionService.getSubRegionIdsByRegionIds(request.getRegionIdList()));
+            }
+        }
         List<String> storeNumList = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(request.getStoreIdList())){
             storeNumList = storeDAO.getStoreNumByStoreIds(request.getStoreIdList());
@@ -414,12 +421,18 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
     @Override
     public PageInfo<EmployeeTrainingVO> assessmentUserList(String userId, EmployeeAssessmentRequest request) {
 
+        List<String> authRegionIdList = new ArrayList<>();
+        if (!sysRoleService.checkIsAdmin(userId)) {
+            authRegionIdList = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
+        }
+
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
-        List<EmployeeTrainingVO> employeeTrainingVOList = employeeTrainingDAO.assessmentUserList(request.getName(), userId, request.getAssessmentStatus(),
+        List<EmployeeTrainingVO> employeeTrainingVOList = employeeTrainingDAO
+                .assessmentUserList(request.getName(), userId, request.getAssessmentStatus(),
                 DateUtils.parseLongDateToStr(request.getEstimatedAssessmentBeginTime()),
                 DateUtils.parseLongDateToStr(request.getEstimatedAssessmentEndTime()),
                 DateUtils.parseLongDateToStr(request.getActualAssessmentBeginTime()),
-                DateUtils.parseLongDateToStr(request.getActualAssessmentEndTime()));
+                DateUtils.parseLongDateToStr(request.getActualAssessmentEndTime()), request.getStoreIdList(), authRegionIdList);
         if (CollectionUtils.isEmpty(employeeTrainingVOList)) {
             return new PageInfo<>(employeeTrainingVOList);
         }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java

@@ -102,6 +102,12 @@ public class EmployeeTrainingController {
     @ApiOperation("培训-战区经理-考核员工列表")
     @PostMapping("/assessmentUserList")
     public ResponseResult<PageInfo<EmployeeTrainingVO>> assessmentUserList(@RequestBody EmployeeAssessmentRequest request) {
+        return ResponseResult.success(employeeTrainingService.assessmentUserList(null, request));
+    }
+
+    @ApiOperation("培训-督导-考核员工列表")
+    @PostMapping("/supervisorUserList")
+    public ResponseResult<PageInfo<EmployeeTrainingVO>> supervisorUserList(@RequestBody EmployeeAssessmentRequest request) {
         return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
     }