diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java index e32267c..293dc7d 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java @@ -483,7 +483,7 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl classPlanDTOs.parallelStream().forEach(classPlanDTO -> { Map queryMap = getHashMap(4); // 开班计划中培训工种为多个 ','号分割 - String workTypeIds[] = classPlanDTO.getWorkerCatalog().split(","); + String[] workTypeIds = classPlanDTO.getWorkerCatalog().split(","); String workTypeNames = ""; for (int i = 0; i < workTypeIds.length; i++) { WorkTypeDTO workTypeDTO = workTypeService.get(workTypeIds[i]); @@ -506,7 +506,7 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl classPlanDTO.setSignUpUserCount(studentsService.count(params)); } else { queryMap.put("applyInstitutionId", classPlanDTO.getOrgId()); - queryMap.put("applyWorkTypeId", classPlanDTO.getWorkerCatalog()); + queryMap.put("applyWorkTypeIds", Arrays.asList(workTypeIds)); List applyAuditStates = new ArrayList<>(); applyAuditStates.add("2"); queryMap.put("applyAuditStates", applyAuditStates); diff --git a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml index a9b863a..1d83e96 100644 --- a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml @@ -712,6 +712,12 @@ AND t1.apply_work_type_id = #{applyWorkTypeId} + + AND t1.apply_work_type_id IN + + #{item} + + AND t1.creator = #{creator}