修改-经纪人跟进状态及新增经纪人条件

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

+package com.yd.api.practitioner.vo.opportunity;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class OpportunityRecordSituationInfo {
+    private Long status;//0.可编辑 1.不可编辑
+    private List<OpportunityRecordInfo> opportunityRecordInfos;//商机跟进
+}

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

@@ -8,7 +8,7 @@ import java.util.List;
 public class OwnOpportunityDetailQueryResponseVO {
 public class OwnOpportunityDetailQueryResponseVO {
     private OpportunityBasicInformationInfo opportunityBasicInformationInfo;//基本信息
     private OpportunityBasicInformationInfo opportunityBasicInformationInfo;//基本信息
     private OpportunityConsultationInfo opportunityConsultationInfo;//服务咨询
     private OpportunityConsultationInfo opportunityConsultationInfo;//服务咨询
-    private List<OpportunityRecordInfo> opportunityRecordInfos;//商机跟进
+    private OpportunityRecordSituationInfo opportunityRecordSituationInfo;
     private OpportunityScore opportunityScore;//商机分数
     private OpportunityScore opportunityScore;//商机分数
     private CommonResult commonResult;
     private CommonResult commonResult;
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/salestarget/SalesTargetMonth.java

@@ -4,9 +4,9 @@ import lombok.Data;
 
 
 @Data
 @Data
 public class SalesTargetMonth {
 public class SalesTargetMonth {
-    private Integer premium;
-    private Integer commission;
+    private Double premium;
+    private Double commission;
     private Integer pieces;
     private Integer pieces;
-    private Integer pieceAveragePremium;
+    private Double pieceAveragePremium;
     private Integer monthNum;
     private Integer monthNum;
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/salestarget/SalesTargetQueryResponseVO.java

@@ -8,10 +8,10 @@ import java.util.List;
 @Data
 @Data
 public class SalesTargetQueryResponseVO {
 public class SalesTargetQueryResponseVO {
     private Long practitionerId;
     private Long practitionerId;
-    private Integer premium;
-    private Integer commission;
+    private Double premium;
+    private Double commission;
     private Integer pieces;
     private Integer pieces;
-    private Integer pieceAveragePremium;
+    private Double pieceAveragePremium;
     private List<SalesTargetMonth> salesTargetMonths;
     private List<SalesTargetMonth> salesTargetMonths;
     private List<SalesTargetActions> salesTargetActions;
     private List<SalesTargetActions> salesTargetActions;
     private CommonResult commonResult;
     private CommonResult commonResult;

yd-api/src/main/java/com/yd/api/practitioner/vo/salestarget/SalesTargetSaveRequestVO.java

@@ -9,11 +9,11 @@ public class SalesTargetSaveRequestVO {
     /**
     /**
      * 保费
      * 保费
      */
      */
-    private Integer premium;
+    private Double premium;
     /**
     /**
      * 佣金
      * 佣金
      */
      */
-    private Integer commission;
+    private Double commission;
     /**
     /**
      * 件数
      * 件数
      */
      */
@@ -21,7 +21,7 @@ public class SalesTargetSaveRequestVO {
     /**
     /**
      * 均价
      * 均价
      */
      */
-    private Integer pieceAveragePremium;
+    private Double pieceAveragePremium;
     /**
     /**
      * 目标类型：1：经纪人指标，2:团队指标
      * 目标类型：1：经纪人指标，2:团队指标
      */
      */

yd-api/src/main/java/com/yd/dal/entity/marketing/MktLeadsGoals.java

 package com.yd.dal.entity.marketing;
 package com.yd.dal.entity.marketing;
 
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -51,12 +52,12 @@ public class MktLeadsGoals {
     /**
     /**
      * 保费
      * 保费
      */
      */
-    private Integer premium;
+    private Double premium;
 
 
     /**
     /**
      * 佣金
      * 佣金
      */
      */
-    private Integer commission;
+    private Double commission;
 
 
     /**
     /**
      * 件数
      * 件数
@@ -66,7 +67,7 @@ public class MktLeadsGoals {
     /**
     /**
      * 件均保费： 计算生成  FYP/件数
      * 件均保费： 计算生成  FYP/件数
      */
      */
-    private Integer pieceAveragePremium;
+    private Double pieceAveragePremium;
 
 
     /**
     /**
      * 版本控制
      * 版本控制

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

@@ -25,4 +25,6 @@ public interface MktLeadsAssignedTrackMapper {
     List<MktLeadsAssignedTrack> findByTrackTimeForNew(MktLeadsAssignedTrack mktLeadsAssignedTrack);
     List<MktLeadsAssignedTrack> findByTrackTimeForNew(MktLeadsAssignedTrack mktLeadsAssignedTrack);
 
 
     HashMap<String, BigDecimal> totalStatisticsForTeam(List<Long> practitionerIds);
     HashMap<String, BigDecimal> totalStatisticsForTeam(List<Long> practitionerIds);
+
+    MktLeadsAssignedTrack findByListNotesForCustomerId(Long customerId);
 }
 }
\ No newline at end of file

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

@@ -44,4 +44,9 @@ public class MktLeadsAssignedTrackDALServiceImpl implements MktLeadsAssignedTrac
     public HashMap<String, BigDecimal> totalStatisticsForTeam(List<Long> practitionerIds) {
     public HashMap<String, BigDecimal> totalStatisticsForTeam(List<Long> practitionerIds) {
         return mktLeadsAssignedTrackMapper.totalStatisticsForTeam(practitionerIds);
         return mktLeadsAssignedTrackMapper.totalStatisticsForTeam(practitionerIds);
     }
     }
+
+    @Override
+    public MktLeadsAssignedTrack findByListNotesForCustomerId(Long customerId) {
+        return mktLeadsAssignedTrackMapper.findByListNotesForCustomerId(customerId);
+    }
 }
 }

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

@@ -21,4 +21,6 @@ public interface MktLeadsAssignedTrackDALService {
      * @return 返回他们的分数统计 1.天得分 2.周得分 3.月得分
      * @return 返回他们的分数统计 1.天得分 2.周得分 3.月得分
      */
      */
     HashMap<String, BigDecimal> totalStatisticsForTeam(List<Long> practitionerIds);
     HashMap<String, BigDecimal> totalStatisticsForTeam(List<Long> practitionerIds);
+
+    MktLeadsAssignedTrack findByListNotesForCustomerId(Long customerId);
 }
 }

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

@@ -334,4 +334,12 @@
           #{practitionerId,jdbcType=BIGINT}
           #{practitionerId,jdbcType=BIGINT}
         </foreach>
         </foreach>
   </select>
   </select>
+    <select id="findByListNotesForCustomerId" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from ag_mkt_leads_assigned_track
+      where customer_id = #{customerId,jdbcType=BIGINT}
+      order by id desc
+      limit 0,1
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file

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

@@ -12,10 +12,10 @@
     <result column="current_year" jdbcType="INTEGER" property="currentYear" />
     <result column="current_year" jdbcType="INTEGER" property="currentYear" />
     <result column="statistic_time_unit" jdbcType="INTEGER" property="statisticTimeUnit" />
     <result column="statistic_time_unit" jdbcType="INTEGER" property="statisticTimeUnit" />
     <result column="seq_time" jdbcType="INTEGER" property="seqTime" />
     <result column="seq_time" jdbcType="INTEGER" property="seqTime" />
-    <result column="premium" jdbcType="INTEGER" property="premium" />
-    <result column="commission" jdbcType="INTEGER" property="commission" />
+    <result column="premium" jdbcType="DECIMAL" property="premium" />
+    <result column="commission" jdbcType="DECIMAL" property="commission" />
     <result column="pieces" jdbcType="INTEGER" property="pieces" />
     <result column="pieces" jdbcType="INTEGER" property="pieces" />
-    <result column="piece_average_premium" jdbcType="INTEGER" property="pieceAveragePremium" />
+    <result column="piece_average_premium" jdbcType="DECIMAL" property="pieceAveragePremium" />
     <result column="current_version" jdbcType="TIMESTAMP" property="currentVersion" />
     <result column="current_version" jdbcType="TIMESTAMP" property="currentVersion" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -51,8 +51,8 @@
       updated_at, updated_by)
       updated_at, updated_by)
     values (#{goalsType,jdbcType=INTEGER}, #{practitionerId,jdbcType=BIGINT}, #{subordinateSystemId,jdbcType=BIGINT}, 
     values (#{goalsType,jdbcType=INTEGER}, #{practitionerId,jdbcType=BIGINT}, #{subordinateSystemId,jdbcType=BIGINT}, 
       #{subordinateSystemName,jdbcType=VARCHAR}, #{currentYear,jdbcType=INTEGER}, #{statisticTimeUnit,jdbcType=INTEGER}, 
       #{subordinateSystemName,jdbcType=VARCHAR}, #{currentYear,jdbcType=INTEGER}, #{statisticTimeUnit,jdbcType=INTEGER}, 
-      #{seqTime,jdbcType=INTEGER}, #{premium,jdbcType=INTEGER}, #{commission,jdbcType=INTEGER}, 
-      #{pieces,jdbcType=INTEGER}, #{pieceAveragePremium,jdbcType=INTEGER}, #{currentVersion,jdbcType=TIMESTAMP}, 
+      #{seqTime,jdbcType=INTEGER}, #{premium,jdbcType=DECIMAL}, #{commission,jdbcType=DECIMAL}, 
+      #{pieces,jdbcType=INTEGER}, #{pieceAveragePremium,jdbcType=DECIMAL}, #{currentVersion,jdbcType=TIMESTAMP}, 
       #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, 
       #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, 
       #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT})
       #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT})
   </insert>
   </insert>
@@ -135,16 +135,16 @@
         #{seqTime,jdbcType=INTEGER},
         #{seqTime,jdbcType=INTEGER},
       </if>
       </if>
       <if test="premium != null">
       <if test="premium != null">
-        #{premium,jdbcType=INTEGER},
+        #{premium,jdbcType=DECIMAL},
       </if>
       </if>
       <if test="commission != null">
       <if test="commission != null">
-        #{commission,jdbcType=INTEGER},
+        #{commission,jdbcType=DECIMAL},
       </if>
       </if>
       <if test="pieces != null">
       <if test="pieces != null">
         #{pieces,jdbcType=INTEGER},
         #{pieces,jdbcType=INTEGER},
       </if>
       </if>
       <if test="pieceAveragePremium != null">
       <if test="pieceAveragePremium != null">
-        #{pieceAveragePremium,jdbcType=INTEGER},
+        #{pieceAveragePremium,jdbcType=DECIMAL},
       </if>
       </if>
       <if test="currentVersion != null">
       <if test="currentVersion != null">
         #{currentVersion,jdbcType=TIMESTAMP},
         #{currentVersion,jdbcType=TIMESTAMP},
@@ -192,16 +192,16 @@
         seq_time = #{seqTime,jdbcType=INTEGER},
         seq_time = #{seqTime,jdbcType=INTEGER},
       </if>
       </if>
       <if test="premium != null">
       <if test="premium != null">
-        premium = #{premium,jdbcType=INTEGER},
+        premium = #{premium,jdbcType=DECIMAL},
       </if>
       </if>
       <if test="commission != null">
       <if test="commission != null">
-        commission = #{commission,jdbcType=INTEGER},
+        commission = #{commission,jdbcType=DECIMAL},
       </if>
       </if>
       <if test="pieces != null">
       <if test="pieces != null">
         pieces = #{pieces,jdbcType=INTEGER},
         pieces = #{pieces,jdbcType=INTEGER},
       </if>
       </if>
       <if test="pieceAveragePremium != null">
       <if test="pieceAveragePremium != null">
-        piece_average_premium = #{pieceAveragePremium,jdbcType=INTEGER},
+        piece_average_premium = #{pieceAveragePremium,jdbcType=DECIMAL},
       </if>
       </if>
       <if test="currentVersion != null">
       <if test="currentVersion != null">
         current_version = #{currentVersion,jdbcType=TIMESTAMP},
         current_version = #{currentVersion,jdbcType=TIMESTAMP},
@@ -234,10 +234,10 @@
       current_year = #{currentYear,jdbcType=INTEGER},
       current_year = #{currentYear,jdbcType=INTEGER},
       statistic_time_unit = #{statisticTimeUnit,jdbcType=INTEGER},
       statistic_time_unit = #{statisticTimeUnit,jdbcType=INTEGER},
       seq_time = #{seqTime,jdbcType=INTEGER},
       seq_time = #{seqTime,jdbcType=INTEGER},
-      premium = #{premium,jdbcType=INTEGER},
-      commission = #{commission,jdbcType=INTEGER},
+      premium = #{premium,jdbcType=DECIMAL},
+      commission = #{commission,jdbcType=DECIMAL},
       pieces = #{pieces,jdbcType=INTEGER},
       pieces = #{pieces,jdbcType=INTEGER},
-      piece_average_premium = #{pieceAveragePremium,jdbcType=INTEGER},
+      piece_average_premium = #{pieceAveragePremium,jdbcType=DECIMAL},
       current_version = #{currentVersion,jdbcType=TIMESTAMP},
       current_version = #{currentVersion,jdbcType=TIMESTAMP},
       is_active = #{isActive,jdbcType=INTEGER},
       is_active = #{isActive,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       created_at = #{createdAt,jdbcType=TIMESTAMP},