Merge branch 'dev_20221018' into dev

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -1919,7 +1919,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
     }
 
     private void updateAgSfpAppointmentRecordInfo(OwnOpportunityRecordSaveRequestVO requestVO, MktLeadsAssignedTrack track) {
-        MktLeadsPool pool = mktLeadsPoolDALService.findByCustomerIdForSfp(track.getCustomerId());
+        MktLeadsPool pool = mktLeadsPoolDALService.findByCustomerIdForSfp(track.getCustomerId(), track.getSfpMainId());
         if(pool != null){
             AgSfpAppointmentRecord agSfpAppointmentRecord = new AgSfpAppointmentRecord();
             agSfpAppointmentRecord.setSfpMainId(pool.getSfpMainId());

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

@@ -29,7 +29,7 @@ public interface MktLeadsPoolMapper {
 
     List<LeadsStatusInfo> findLeadsStatusMap();
 
-    MktLeadsPool findByCustomerIdForSfp(Long customerId);
+    MktLeadsPool findByCustomerIdForSfp(@Param("customerId") Long customerId, @Param("sfpMainId") Long sfpMainId);
     MktLeadsPool findBySfpMainId(Long sfpMainId);
 
 }

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

@@ -64,8 +64,8 @@ public class MktLeadsPoolDALServiceImpl implements MktLeadsPoolDALService {
     }
 
     @Override
-    public MktLeadsPool findByCustomerIdForSfp(Long customerId) {
-        return mktLeadsPoolMapper.findByCustomerIdForSfp(customerId);
+    public MktLeadsPool findByCustomerIdForSfp(Long customerId, Long sfpMainId) {
+        return mktLeadsPoolMapper.findByCustomerIdForSfp(customerId, sfpMainId);
     }
     @Override
     public MktLeadsPool findBySfpMainId(Long sfpMainId) {

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

@@ -22,7 +22,7 @@ public interface MktLeadsPoolDALService {
     
     void updateMktLeadsAssigneds(MktLeadsPool pool);
 
-    MktLeadsPool findByCustomerIdForSfp(Long customerId);
+    MktLeadsPool findByCustomerIdForSfp(Long customerId, Long sfpMainId);
     MktLeadsPool findBySfpMainId(Long sfpMainId);
 
 }

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

@@ -276,6 +276,12 @@
         where a.appointment_record_id=b.id  and b.user_id=c.id
         and b.status = 0 and b.is_complete =0
         and a.customer_id = #{customerId,jdbcType=BIGINT}
+	    <if test="sfpMainId != null">
+	         and a.sfp_main_id = #{sfpMainId,jdbcType=BIGINT}
+	    </if>
+	    <if test="sfpMainId == null">
+	         and a.sfp_main_id is null
+	    </if>
         and a.appointment_record_id is not null
         and a.is_active=1
     </select>