员工考核
This commit is contained in:
@@ -39,8 +39,11 @@ public class AssessmentDataDAO {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public List<AssessmentDataDO> selectList(Long shopId, String userId) {
|
||||
return assessmentDataMapper.select(AssessmentDataDO.builder().shopId(shopId).assessmentUserId(userId).build());
|
||||
public List<AssessmentDataDO> selectList(Long shopId, String userId, List<Long> templateIdList) {
|
||||
Example example = new Example(AssessmentDataDO.class);
|
||||
example.createCriteria().andEqualTo("assessmentUserId", userId).andEqualTo("shopId", shopId).andIn("templateId", templateIdList);
|
||||
|
||||
return assessmentDataMapper.selectByExample(example);
|
||||
}
|
||||
|
||||
public AssessmentDataDO selectByTemplateId(Long templateId, String userId, Long shopId) {
|
||||
@@ -60,4 +63,9 @@ public class AssessmentDataDAO {
|
||||
example.createCriteria().andEqualTo("assessmentUserId", userId).andEqualTo("shopId", shopId).andIsNotNull("qualified");
|
||||
return assessmentDataMapper.selectCountByExample(example);
|
||||
}
|
||||
|
||||
public AssessmentDataDO selectByPrimaryKey(Long id) {
|
||||
return assessmentDataMapper.selectByPrimaryKey(id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -56,5 +56,11 @@ public class EmployeeTrainingDAO {
|
||||
return employeeTrainingMapper.trainingListByShopId(shopId, trainingTeacherUserId, status);
|
||||
}
|
||||
|
||||
|
||||
public List<EmployeeTrainingVO> assessmentUserList(String name, String practicalAssessmentUserId,
|
||||
Integer assessmentStatus,
|
||||
String estimatedAssessmentBeginTime, String estimatedAssessmentEndTime,
|
||||
String actualAssessmentBeginTime, String actualAssessmentEndTime) {
|
||||
return employeeTrainingMapper.assessmentUserList(name, practicalAssessmentUserId, assessmentStatus, estimatedAssessmentBeginTime,
|
||||
estimatedAssessmentEndTime, actualAssessmentBeginTime, actualAssessmentEndTime);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,13 +11,19 @@ import java.util.List;
|
||||
|
||||
public interface EmployeeTrainingMapper extends Mapper<EmployeeTrainingDO> {
|
||||
|
||||
List<EmployeeTrainingVO> employeeTrainingMapper(@Param("keyWord") String keyWord, @Param("regionIdList") List<String> regionIdList,
|
||||
@Param("authRegionIdList") List<String> authRegionIdList, @Param("assignFlag") Boolean assignFlag,
|
||||
@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("shopIdList") List<Long> shopIdList,
|
||||
@Param("theoreticalExamStatus") Integer theoreticalExamStatus,
|
||||
@Param("practicalExamStatus") Integer practicalExamStatus,
|
||||
@Param("assessmentStatus") Integer assessmentStatus);
|
||||
List<EmployeeTrainingVO> employeeTrainingMapper(@Param("keyWord") String keyWord, @Param("regionIdList") List<String> regionIdList,
|
||||
@Param("authRegionIdList") List<String> authRegionIdList, @Param("assignFlag") Boolean assignFlag,
|
||||
@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("shopIdList") List<Long> shopIdList,
|
||||
@Param("theoreticalExamStatus") Integer theoreticalExamStatus,
|
||||
@Param("practicalExamStatus") Integer practicalExamStatus,
|
||||
@Param("assessmentStatus") Integer assessmentStatus);
|
||||
|
||||
List<EmployeeTrainingVO> trainingListByShopId(@Param("shopId") Long shopId, @Param("trainingTeacherUserId") String trainingTeacherUserId,
|
||||
@Param("status") Integer status);
|
||||
List<EmployeeTrainingVO> trainingListByShopId(@Param("shopId") Long shopId, @Param("trainingTeacherUserId") String trainingTeacherUserId,
|
||||
@Param("status") Integer status);
|
||||
|
||||
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
|
||||
);
|
||||
}
|
||||
@@ -124,4 +124,55 @@
|
||||
and u.shop_id = #{shopId}
|
||||
</if>
|
||||
</select>
|
||||
<select id="assessmentUserList" resultType="com.cool.store.vo.EmployeeTrainingVO">
|
||||
select
|
||||
u.id,
|
||||
u.username,
|
||||
u.mobile,
|
||||
u.region_id as regionId,
|
||||
u.role_id as roleId,
|
||||
u.shop_id as shopId,
|
||||
s.shop_name as shopName,
|
||||
u.id_card as idCard,
|
||||
e.id as employeeTrainingId,
|
||||
e.training_store_id as trainingStoreId,
|
||||
e.training_teacher_user_id as trainingTeacherUserId,
|
||||
e.practical_assessment_user_id as practicalAssessmentUserId,
|
||||
e.assessment_num as assessmentNum,
|
||||
e.assessment_total_num as assessmentTotalNum,
|
||||
e.theoretical_exam_status as theoreticalExamStatus,
|
||||
e.theoretical_exam_score as theoreticalExamScore,
|
||||
e.practical_exam_status as practicalExamStatus,
|
||||
e.practical_exam_score as practicalExamScore,
|
||||
e.assessment_status as assessmentStatus,
|
||||
e.estimated_assessment_time as estimatedAssessmentTime,
|
||||
e.actual_assessment_time as actualAssessmentTime,
|
||||
e.training_start_time as trainingStartTime,
|
||||
e.training_end_time as trainingEndTime
|
||||
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
|
||||
where u.deleted = 0
|
||||
<if test="practicalAssessmentUserId != null and practicalAssessmentUserId != ''">
|
||||
and e.practical_assessment_user_id = #{practicalAssessmentUserId}
|
||||
</if>
|
||||
<if test="assessmentStatus != null">
|
||||
and e.assessment_status = #{assessmentStatus}
|
||||
</if>
|
||||
<if test="estimatedAssessmentBeginTime != null and estimatedAssessmentBeginTime != ''">
|
||||
and e.estimated_assessment_time >= #{estimatedAssessmentBeginTime}
|
||||
</if>
|
||||
<if test="estimatedAssessmentEndTime != null and estimatedAssessmentEndTime != ''">
|
||||
and e.estimated_assessment_time <= #{estimatedAssessmentEndTime}
|
||||
</if>
|
||||
<if test="actualAssessmentBeginTime != null and actualAssessmentBeginTime != ''">
|
||||
and e.actual_assessment_time >= #{actualAssessmentBeginTime}
|
||||
</if>
|
||||
<if test="actualAssessmentEndTime != null and actualAssessmentEndTime != ''">
|
||||
and e.actual_assessment_time <= #{actualAssessmentEndTime}
|
||||
</if>
|
||||
<if test="name != null and name != ''">
|
||||
and u.username like concat('%',#{name},'%')
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user