1.商机可以删除,变成不可见，如果重新建立商机，手机号重复，允许

2.团队业绩，加一个“去年”的时间段
3.团队业绩，进入后，上面的面板增加3列 目标FYP，目标FYC，完成率 。下面的排名，增加1列，目标FYC

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -757,4 +757,19 @@ public class PractitionerController {
         result.setData(responseVO);
         result.setData(responseVO);
         return result;
         return result;
     }
     }
+
+    /**
+     * 逻辑删除商机
+     * @param OpportunityDeleteRequestVO
+     * @return CommonResultIDResponseVO
+     * @author Yan Wenyang
+     */
+    @RequestMapping("/deleteOpportunity")
+    public Object deleteOpportunity(@RequestBody OpportunityDeleteRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        CommonResultIDResponseVO responseVO = practitionerService.updateOpportunity(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerService.java

@@ -274,4 +274,13 @@ public interface PractitionerService {
      * @author Yan Wenyang
      * @author Yan Wenyang
      */
      */
     CommonResultIDResponseVO signUnionSales(SignUnionSalesRequestVO requestVO);
     CommonResultIDResponseVO signUnionSales(SignUnionSalesRequestVO requestVO);
+
+    /**
+     * 逻辑删除商机
+     * @param OpportunityDeleteRequestVO
+     * @return CommonResultIDResponseVO
+     * @author Yan Wenyang
+     */
+    CommonResultIDResponseVO updateOpportunity(OpportunityDeleteRequestVO requestVO);
+
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/opportunity/OpportunityDeleteRequestVO.java

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+@Data
+public class OpportunityDeleteRequestVO {
+    private Long practitionerId;//经纪人ID
+    private Long opportunityId;//商机Id
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/rank/AclCustomerFortuneStatistics.java

@@ -12,6 +12,9 @@ public class AclCustomerFortuneStatistics implements Serializable {
     private Integer count;
     private Integer count;
     private Double fyp;
     private Double fyp;
     private Double fyc;
     private Double fyc;
+    private Double targetFyc; 	//目标FYP
+    private Double targetFyp; 	//目标FYC
+    private Integer targetCount;//目标件数
 
 
     public Integer getRank() {
     public Integer getRank() {
         return rank;
         return rank;
@@ -92,6 +95,30 @@ public class AclCustomerFortuneStatistics implements Serializable {
     public void setFyc(Double fyc) {
     public void setFyc(Double fyc) {
         this.fyc = fyc;
         this.fyc = fyc;
     }
     }
+    
+	public Double getTargetFyc() {
+		return targetFyc;
+	}
 
 
-    private static final long serialVersionUID = 1L;
+	public void setTargetFyc(Double targetFyc) {
+		this.targetFyc = targetFyc;
+	}
+	
+	public Double getTargetFyp() {
+		return targetFyp;
+	}
+
+	public void setTargetFyp(Double targetFyp) {
+		this.targetFyp = targetFyp;
+	}
+
+	public Integer getTargetCount() {
+		return targetCount;
+	}
+
+	public void setTargetCount(Integer targetCount) {
+		this.targetCount = targetCount;
+	}
+
+	private static final long serialVersionUID = 1L;
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemMemberInfo.java

@@ -8,6 +8,9 @@ public class SubordinateSystemMemberInfo {
     private Double fyp;
     private Double fyp;
     private Double fyc;
     private Double fyc;
     private Integer count;
     private Integer count;
+    private Double targetFyc; 	//目标FYP
+    private Double targetFyp; 	//目标FYC
+    private Integer targetCount;//目标件数
 
 
     public Long getPractitionerId() {
     public Long getPractitionerId() {
         return practitionerId;
         return practitionerId;
@@ -64,4 +67,29 @@ public class SubordinateSystemMemberInfo {
     public void setCount(Integer count) {
     public void setCount(Integer count) {
         this.count = count;
         this.count = count;
     }
     }
+
+	public Double getTargetFyc() {
+		return targetFyc;
+	}
+
+	public void setTargetFyc(Double targetFyc) {
+		this.targetFyc = targetFyc;
+	}
+
+	public Double getTargetFyp() {
+		return targetFyp;
+	}
+
+	public void setTargetFyp(Double targetFyp) {
+		this.targetFyp = targetFyp;
+	}
+
+	public Integer getTargetCount() {
+		return targetCount;
+	}
+
+	public void setTargetCount(Integer targetCount) {
+		this.targetCount = targetCount;
+	}
+    
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemMemberQueryRequestVO.java

@@ -2,7 +2,7 @@ package com.yd.api.practitioner.vo.subordinate;
 
 
 public class SubordinateSystemMemberQueryRequestVO {
 public class SubordinateSystemMemberQueryRequestVO {
     private Long practitionerId;
     private Long practitionerId;
-    private Integer time;//1=month,3=quarter,2=year
+    private Integer time;//1=month,3=quarter,2=year,4=去年
     private Integer type;//1=online,2=offLine
     private Integer type;//1=online,2=offLine
 
 
 
 

yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemStatisticInfo.java

@@ -5,6 +5,9 @@ public class SubordinateSystemStatisticInfo {
     private Double fyp;
     private Double fyp;
     private Integer count;
     private Integer count;
     private Double completionRate;
     private Double completionRate;
+    private Double targetFyc;//目标FYP
+    private Double targetFyp;//目标FYC,目标件数
+    private Integer targetCount;//目标件数
 
 
     public Double getFyc() {
     public Double getFyc() {
         return fyc;
         return fyc;
@@ -37,4 +40,29 @@ public class SubordinateSystemStatisticInfo {
     public void setCompletionRate(Double completionRate) {
     public void setCompletionRate(Double completionRate) {
         this.completionRate = completionRate;
         this.completionRate = completionRate;
     }
     }
+
+	public Double getTargetFyc() {
+		return targetFyc;
+	}
+
+	public void setTargetFyc(Double targetFyc) {
+		this.targetFyc = targetFyc;
+	}
+
+	public Double getTargetFyp() {
+		return targetFyp;
+	}
+
+	public void setTargetFyp(Double targetFyp) {
+		this.targetFyp = targetFyp;
+	}
+
+	public Integer getTargetCount() {
+		return targetCount;
+	}
+
+	public void setTargetCount(Integer targetCount) {
+		this.targetCount = targetCount;
+	}
+    
 }
 }

yd-api/src/main/java/com/yd/dal/mapper/marketing/MktLeadsExpertAssignMapper.java

 package com.yd.dal.mapper.marketing;
 package com.yd.dal.mapper.marketing;
 
 
-import com.yd.dal.entity.marketing.MktLeadsExpertAssign;
 import java.util.List;
 import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import com.yd.dal.entity.marketing.MktLeadsExpertAssign;
+
 public interface MktLeadsExpertAssignMapper {
 public interface MktLeadsExpertAssignMapper {
     int deleteByPrimaryKey(Long id);
     int deleteByPrimaryKey(Long id);
 
 

yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsExpertAssignDALServiceImpl.java

 package com.yd.dal.service.marketing.Impl;
 package com.yd.dal.service.marketing.Impl;
 
 
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
 import com.yd.dal.entity.marketing.MktLeadsExpertAssign;
 import com.yd.dal.entity.marketing.MktLeadsExpertAssign;
 import com.yd.dal.mapper.marketing.MktLeadsExpertAssignMapper;
 import com.yd.dal.mapper.marketing.MktLeadsExpertAssignMapper;
 import com.yd.dal.service.marketing.MktLeadsExpertAssignDALService;
 import com.yd.dal.service.marketing.MktLeadsExpertAssignDALService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 
 
 @Service("mktLeadsExpertAssignDALService")
 @Service("mktLeadsExpertAssignDALService")
 public class MktLeadsExpertAssignDALServiceImpl implements MktLeadsExpertAssignDALService {
 public class MktLeadsExpertAssignDALServiceImpl implements MktLeadsExpertAssignDALService {
@@ -17,4 +18,10 @@ public class MktLeadsExpertAssignDALServiceImpl implements MktLeadsExpertAssignD
     public MktLeadsExpertAssign findByLeadsExpertRequestId(Long mktLeadsExpertRequestId) {
     public MktLeadsExpertAssign findByLeadsExpertRequestId(Long mktLeadsExpertRequestId) {
         return mktLeadsExpertAssignMapper.selectByLeadsExpertRequestId(mktLeadsExpertRequestId);
         return mktLeadsExpertAssignMapper.selectByLeadsExpertRequestId(mktLeadsExpertRequestId);
     }
     }
+
+    @Override
+    public int updateByPrimaryKeySelective(MktLeadsExpertAssign mktLeadsExpertAssign) {
+        return mktLeadsExpertAssignMapper.updateByPrimaryKeySelective(mktLeadsExpertAssign);
+    }
+
 }
 }

yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsExpertRequestDALServiceImpl.java

@@ -27,4 +27,9 @@ public class MktLeadsExpertRequestDALServiceImpl implements MktLeadsExpertReques
     public MktLeadsExpertRequest findByCustomerId(Long customerId) {
     public MktLeadsExpertRequest findByCustomerId(Long customerId) {
         return mktLeadsExpertRequestMapper.selectByCustomerId(customerId);
         return mktLeadsExpertRequestMapper.selectByCustomerId(customerId);
     }
     }
+    
+    @Override
+    public int updateByPrimaryKeySelective(MktLeadsExpertRequest mktLeadsExpertRequest) {
+        return mktLeadsExpertRequestMapper.updateByPrimaryKeySelective(mktLeadsExpertRequest);
+    }
 }
 }

yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsPoolDALServiceImpl.java

 package com.yd.dal.service.marketing.Impl;
 package com.yd.dal.service.marketing.Impl;
 
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsInfo;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsInfo;
-import com.yd.api.agms.vo.statistics.statementData;
 import com.yd.dal.entity.leads.LeadsStatusInfo;
 import com.yd.dal.entity.leads.LeadsStatusInfo;
 import com.yd.dal.entity.marketing.MktLeadsPool;
 import com.yd.dal.entity.marketing.MktLeadsPool;
 import com.yd.dal.mapper.marketing.MktLeadsPoolMapper;
 import com.yd.dal.mapper.marketing.MktLeadsPoolMapper;
 import com.yd.dal.service.marketing.MktLeadsPoolDALService;
 import com.yd.dal.service.marketing.MktLeadsPoolDALService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 @Service("mktLeadsPoolDALService")
 @Service("mktLeadsPoolDALService")
 public class MktLeadsPoolDALServiceImpl implements MktLeadsPoolDALService {
 public class MktLeadsPoolDALServiceImpl implements MktLeadsPoolDALService {
@@ -56,4 +57,9 @@ public class MktLeadsPoolDALServiceImpl implements MktLeadsPoolDALService {
         PageInfo<LeadsStatisticsInfo> pageInfo = new PageInfo<>(statementData);
         PageInfo<LeadsStatisticsInfo> pageInfo = new PageInfo<>(statementData);
         return pageInfo;
         return pageInfo;
     }
     }
+    
+    @Override
+    public void updateMktLeadsAssigneds(MktLeadsPool pool){
+    	mktLeadsPoolMapper.updateByPrimaryKeySelective(pool);
+    }
 }
 }

yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsExpertAssignDALService.java

@@ -4,4 +4,6 @@ import com.yd.dal.entity.marketing.MktLeadsExpertAssign;
 
 
 public interface MktLeadsExpertAssignDALService {
 public interface MktLeadsExpertAssignDALService {
     MktLeadsExpertAssign findByLeadsExpertRequestId(Long mktLeadsExpertRequestId);
     MktLeadsExpertAssign findByLeadsExpertRequestId(Long mktLeadsExpertRequestId);
+
+    int updateByPrimaryKeySelective(MktLeadsExpertAssign mktLeadsExpertAssign);
 }
 }

yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsExpertRequestDALService.java

@@ -8,4 +8,7 @@ public interface MktLeadsExpertRequestDALService {
     MktLeadsExpertRequest findByLeadsAssignedId(Long assignedId);
     MktLeadsExpertRequest findByLeadsAssignedId(Long assignedId);
 
 
     MktLeadsExpertRequest findByCustomerId(Long customerId);
     MktLeadsExpertRequest findByCustomerId(Long customerId);
+    
+    int updateByPrimaryKeySelective(MktLeadsExpertRequest mktLeadsExpertRequest);
+    
 }
 }

yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsPoolDALService.java

 package com.yd.dal.service.marketing;
 package com.yd.dal.service.marketing;
 
 
+import java.util.List;
+import java.util.Map;
+
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsInfo;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsInfo;
 import com.yd.dal.entity.marketing.MktLeadsPool;
 import com.yd.dal.entity.marketing.MktLeadsPool;
 
 
-import java.util.List;
-import java.util.Map;
-
 public interface MktLeadsPoolDALService {
 public interface MktLeadsPoolDALService {
     MktLeadsPool findByCustomerId(Long customerId);
     MktLeadsPool findByCustomerId(Long customerId);
 
 
@@ -19,4 +19,6 @@ public interface MktLeadsPoolDALService {
     Map<Long, Long> findLeadsStatusMap();
     Map<Long, Long> findLeadsStatusMap();
 
 
     PageInfo<LeadsStatisticsInfo> findByConditionPage(int pageNum, int size, Integer isStatement, Integer leadsStatus, Integer expertApplyStatus, String leadsStartTime, String leadsEndTime);
     PageInfo<LeadsStatisticsInfo> findByConditionPage(int pageNum, int size, Integer isStatement, Integer leadsStatus, Integer expertApplyStatus, String leadsStartTime, String leadsEndTime);
+    
+    void updateMktLeadsAssigneds(MktLeadsPool pool);
 }
 }

yd-api/src/main/resources/mapper/customer/AclCustomerFortuneMapper.xml

@@ -978,7 +978,31 @@
         ifnull(COUNT(f.id),0) count ,
         ifnull(COUNT(f.id),0) count ,
         ifnull(SUM(f.order_price),0)  FYP ,
         ifnull(SUM(f.order_price),0)  FYP ,
         ifnull(SUM(f.fyc_amount),0) FYC  ,
         ifnull(SUM(f.fyc_amount),0) FYC  ,
-        s.practitioner_level practitionerLevelId
+        s.practitioner_level practitionerLevelId,
+        (select ifnull(sum(t.commission),0) from ag_mkt_leads_goals t where t.practitioner_id=p.id and t.goals_type=1 and t.is_active=1
+	      <choose>
+	        <when test="time == 1">
+	        	and t.statistic_time_unit=3
+	            and t.current_year=year(now())
+	            and t.seq_time=month(now())
+	        </when>
+	        <when test="time == 3">
+	        	and t.statistic_time_unit=3
+	            and t.current_year=year(now())
+          		and quarter(concat(t.current_year,'-',t.seq_time,'-01'))=quarter(now())
+	        </when>
+	        <when test="time == 4">
+	        	and t.statistic_time_unit=1
+	            and t.current_year=year(now())-1
+	        </when>
+	        <otherwise>
+	        	and t.statistic_time_unit=1
+	            and t.current_year=year(now())
+	        </otherwise>
+	      </choose>
+      ) targetFyc,
+      0 targetFyp,
+      0 targetCount
       FROM
       FROM
       ((ag_acl_practitioner_setting s LEFT JOIN ag_acl_practitioner p ON s.practitioner_id = p.id)
       ((ag_acl_practitioner_setting s LEFT JOIN ag_acl_practitioner p ON s.practitioner_id = p.id)
       INNER JOIN ag_acl_customer_fortune f ON f.customer_id = p.customer_id and f.drop_option_code in('S01','C01') )
       INNER JOIN ag_acl_customer_fortune f ON f.customer_id = p.customer_id and f.drop_option_code in('S01','C01') )
@@ -992,6 +1016,9 @@
         <when test="time == 3">
         <when test="time == 3">
           and QUARTER(f.order_date) = QUARTER(NOW()) AND year(f.order_date)=year(now())
           and QUARTER(f.order_date) = QUARTER(NOW()) AND year(f.order_date)=year(now())
         </when>
         </when>
+        <when test="time == 4">
+          and YEAR(f.order_date) = YEAR(now())-1
+        </when>
         <otherwise>
         <otherwise>
           and YEAR(f.order_date) = YEAR(now())
           and YEAR(f.order_date) = YEAR(now())
         </otherwise>
         </otherwise>

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -1504,9 +1504,10 @@
     if(ass.id is null ,0,1) expertType
     if(ass.id is null ,0,1) expertType
     FROM
     FROM
     ag_mkt_leads_assigneds a
     ag_mkt_leads_assigneds a
-    left join ag_mkt_leads_expert_request r left join ag_mkt_leads_expert_assign ass on ass.leads_expert_request_id = r.id on r.customer_id = a.customer_id
-    LEFT JOIN ag_mkt_leads_pool p ON p.customer_id = a.customer_id
-    LEFT JOIN ag_acl_customer c ON c.id = a.customer_id
+    left join ag_mkt_leads_expert_request r on r.customer_id = a.customer_id and r.is_active =1
+    left join ag_mkt_leads_expert_assign ass on ass.leads_expert_request_id = r.id and ass.is_active =1
+    left join ag_mkt_leads_pool p ON p.customer_id = a.customer_id and p.is_active =1
+    left join ag_acl_customer c ON c.id = a.customer_id
     where a.is_active=1
     where a.is_active=1
     <if test="practitionerId != null">
     <if test="practitionerId != null">
       and a.assigned_practitioner_id = #{practitionerId}
       and a.assigned_practitioner_id = #{practitionerId}

yd-api/src/main/resources/mapper/marketing/MktLeadsPoolMapper.xml

@@ -153,6 +153,7 @@
       <include refid="Base_Column_List" />
       <include refid="Base_Column_List" />
       from ag_mkt_leads_pool
       from ag_mkt_leads_pool
       where customer_id = #{customerId,jdbcType=BIGINT}
       where customer_id = #{customerId,jdbcType=BIGINT}
+      and is_active=1
   </select>
   </select>
   <select id="findALLByDate" resultType="com.yd.api.agms.vo.statistics.LeadsStatisticsInfo">
   <select id="findALLByDate" resultType="com.yd.api.agms.vo.statistics.LeadsStatisticsInfo">
     select  c.id as leadsCustomerId,
     select  c.id as leadsCustomerId,