From 22da7c3ee7257d3137c8d971eabbeb5d27590e57 Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Mon, 20 Mar 2023 17:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=8D=E5=90=88=E5=B7=A5?=
 =?UTF-8?q?=E7=A7=8D=E5=BC=80=E7=8F=AD=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E5=9F=B9=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1=E4=B8=8D=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/classplan/impl/ClassPlanServiceImpl.java        | 4 ++--
 src/main/resources/mybatis/mapper/apply/apply-mapper.xml    | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

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<String, Object> 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<String> 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 @@
          <if test="applyWorkTypeId != null and applyWorkTypeId != ''">
             AND t1.apply_work_type_id = #{applyWorkTypeId}
         </if>
+        <if test="applyWorkTypeIds != null and applyWorkTypeIds.size > 0">
+            AND t1.apply_work_type_id IN
+            <foreach collection="applyWorkTypeIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="creator != null and creator != ''">
             AND t1.creator = #{creator}
         </if>