楚江ERP-客户开发调整

@@ -123,6 +123,12 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> {
     private Double settleDays;
 
     /**
+     * 责任人ID
+     */
+    @ApiModelProperty("责任人ID")
+    private String chargeUserId;
+
+    /**
      * 责任人
      */
     @ApiModelProperty("责任人")

@@ -26,7 +26,6 @@ import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
@@ -66,7 +65,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
     private TypeInfoService typeInfoService;
     @Resource
     private ProductVarietyService productVarietyService;
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
 
 

@@ -25,6 +25,7 @@ import com.lframework.xingyun.sc.vo.customer.develop.QueryCustomerDevelopPlanVo;
 import com.lframework.xingyun.sc.vo.customer.develop.UpdateCustomerDevelopPlanVo;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -36,7 +37,33 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     public PageResult<CustomerDevelopPlan> query(Integer pageIndex, Integer pageSize, QueryCustomerDevelopPlanVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
-
+        // 厂房类型处理
+        String workshopType = vo.getWorkshopType();
+        if ("TYPE_1".equals(workshopType)) {
+            // 一、二分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("一分厂");
+            workshopNameList.add("二分厂");
+            vo.setWorkshopNames(workshopNameList);
+        } else if ("TYPE_2".equals(workshopType)) {
+            // 三、四分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("三分厂");
+            workshopNameList.add("四分厂");
+            vo.setWorkshopNames(workshopNameList);
+        } else if ("TYPE_3".equals(workshopType)) {
+            // 紫铜分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("紫铜分厂");
+            vo.setWorkshopNames(workshopNameList);
+        }
+        // 待办类型
+        String todoType = vo.getTodoType();
+        if ("COMPLETED".equals(todoType)) {
+
+        } else if ("WAIT".equals(todoType)) {
+            
+        }
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<CustomerDevelopPlan> dataList = this.query(vo);
 

@@ -8,6 +8,8 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class QueryCustomerDevelopPlanVo extends SortPageVo implements BaseVo, Serializable {
@@ -41,4 +43,27 @@ public class QueryCustomerDevelopPlanVo extends SortPageVo implements BaseVo, Se
     @IsEnum(message = "状态格式不正确！", enumClass = CustomerDevelopStatus.class)
     private Integer status;
 
+    /**
+     * 时间范围（创建时间）
+     */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createStartTime;
+    private LocalDateTime createEndTime;
+
+    /**
+     * 厂房类型
+     * TYPE_1:一、二分厂
+     * TYPE_2:三、四分厂
+     */
+    @ApiModelProperty("厂房类型")
+    private String workshopType;
+    private List<String> workshopNames;
+
+    /**
+     * 待办类型
+     * COMPLETED:已办
+     * WAIT:待办
+     */
+    @ApiModelProperty("待办类型")
+    private String todoType;
 }

@@ -62,6 +62,9 @@
 
     <select id="query" resultMap="CustomerDevelopPlan">
         <include refid="CustomerDevelopPlan_sql"/>
+        <if test = "vo.workshopType != null and vo.workshopType != ''">
+            LEFT JOIN base_data_workshop w ON tb.workshop_id = w.id
+        </if>
         <where>
             <if test="vo.customerId != null and vo.customerId != ''">
                 AND tb.customer_id = #{vo.customerId}
@@ -75,6 +78,12 @@
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </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>
         </where>
     </select>
 </mapper>