suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

管辖范围考核人员

Browse Source
This commit is contained in:
bianyadong
2024-05-17 16:44:35 +08:00
parent b463d7666f
commit 8d12d79274
9 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -26,5 +26,5 @@ public interface EmployeeTrainingMapper extends Mapper<EmployeeTrainingDO> {
@Param("assessmentStatus") Integer assessmentStatus,
@Param("estimatedAssessmentBeginTime") String estimatedAssessmentBeginTime, @Param("estimatedAssessmentEndTime") String estimatedAssessmentEndTime,
@Param("actualAssessmentBeginTime") String actualAssessmentBeginTime, @Param("actualAssessmentEndTime") String actualAssessmentEndTime,
@Param("storeIdList") List<String> storeIdList, @Param("authRegionIdList") List<String> authRegionIdList);
@Param("storeIdList") List<String> storeIdList);
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
View File

@@ -86,6 +86,8 @@ public interface RegionMapper {
List<String> getSubRegionIdsByRegionIds( @Param("regionIds")List<String> regionIds);
List<String> getStoreIdsByRegionIds( @Param("regionIds")List<String> regionIds);
List<String> getSubIdsByRegionpaths( @Param("regionPaths")List<String> regionPaths);
List<String> getRegionPathByRegionIds( @Param("regionIds")List<String> regionIds);

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

@@ -181,9 +181,7 @@
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>
@@ -202,17 +200,19 @@
<if test="name != null and name != ''">
and u.username like concat('%',#{name},'%')
</if>
<if test="storeIdList != null and storeIdList.size() > 0">
<if test="practicalAssessmentUserId != null and practicalAssessmentUserId != '' and storeIdList != null and storeIdList.size() > 0">
and (e.practical_assessment_user_id = #{practicalAssessmentUserId}
or e.training_store_id in
<foreach collection="storeIdList" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
)
</if>
<if test="practicalAssessmentUserId == null and 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>

11
coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
View File

@@ -285,6 +285,17 @@
<foreach collection="regionIds" separator=" or " open="(" close=")" item="region" > region_path like concat("%", #{region}, "%")</foreach>
</select>
<select id="getStoreIdsByRegionIds" resultType="string">
select
store_id
from
region_${enterpriseId}
where
deleted = 0
and
<foreach collection="regionIds" separator=" or " open="(" close=")" item="region" > region_path like concat("%", #{region}, "%")</foreach>
</select>
<select id="getSubIdsByRegionpaths" resultType="string">
select
id