楚江ERP:客户开发-分成一、二、三、四分厂不再合并一二、三四分厂

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

@@ -64,11 +64,20 @@ public class QueryCustomerDevelopPlanVo extends SortPageVo implements BaseVo, Se
 
 
     /**
     /**
      * 厂房类型
      * 厂房类型
-     * TYPE_1:一、二分厂
-     * TYPE_2:三、四分厂
+     * TYPE_1:一分厂
+     * TYPE_2:二分厂
+     * TYPE_3:三分厂
+     * TYPE_4:四分厂
      */
      */
     @ApiModelProperty("厂房类型")
     @ApiModelProperty("厂房类型")
     private String workshopType;
     private String workshopType;
+
+    /**
+     * 厂房编码
+     */
+    @ApiModelProperty("厂房编码")
+    private String workshopCode;
+
     private List<String> workshopNames;
     private List<String> workshopNames;
 
 
     /**
     /**

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