楚江ERP:客户开发分厂代码还原

@@ -81,13 +81,22 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         // 厂房类型处理
         String workshopType = vo.getWorkshopType();
         if ("TYPE_1".equals(workshopType)) {
-            vo.setWorkshopCode("yfc");
+            // 一、二分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("一分厂");
+            workshopNameList.add("二分厂");
+            vo.setWorkshopNames(workshopNameList);
         } else if ("TYPE_2".equals(workshopType)) {
-            vo.setWorkshopCode("efc");
+            // 三、四分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("三分厂");
+            workshopNameList.add("四分厂");
+            vo.setWorkshopNames(workshopNameList);
         } else if ("TYPE_3".equals(workshopType)) {
-            vo.setWorkshopCode("sfc");
-        } else if ("TYPE_4".equals(workshopType)) {
-            vo.setWorkshopCode("ztfc");
+            // 紫铜分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("紫铜分厂");
+            vo.setWorkshopNames(workshopNameList);
         }
         // 待办类型
         String todoType = vo.getTodoType();

@@ -82,8 +82,11 @@
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>
-            <if test="vo.workshopCode != null and vo.workshopCode != ''">
-                AND w.code = #{vo.workshopCode}
+            <if test = "vo.workshopType != null and vo.workshopType != ''">
+                AND w.name in
+                <foreach collection="vo.workshopNames" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
             </if>
             <if test="vo.createStartTime != null">
                 AND tb.create_time >= #{vo.createStartTime}