线上线下FYC和活动时间

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

@@ -323,7 +323,8 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
         for (PersonalPEPScore online: saleAndRecuit ) {
             for (PersonalOffLineFYC offline: personalOffLineFYCList) {
                 if (online.getMobileNo().equals(offline.getMobileNo())) {
-                    online.getFYC().add(offline.getFYC());
+                    BigDecimal totalFYC = online.getFYC().add(offline.getFYC());
+                    online.setFYC(totalFYC);
                     break;
                 }
             }

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsDashboardDALServiceImpl.java

@@ -144,6 +144,8 @@ public class AgmsDashboardDALServiceImpl implements AgmsDashboardDALService {
     @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
     public List<PersonalOffLineFYC> offLineFYC(List<String> mobileNoList) {
         List<PersonalOffLineFYC> personalOffLineFYCList = agmsDashboardMapper.personalOffLineFYC(mobileNoList);
+        System.out.println("看看线下FYC");
+        System.out.println(personalOffLineFYCList);
         return personalOffLineFYCList;
     }
 }

yd-api/src/main/resources/mapper/agms/AgmsDashboardMapper.xml

@@ -285,10 +285,11 @@ where ps.practitioner_type_id = 28
     <select id="personalOffLineFYC" resultType="com.yd.dal.entity.practitioner.PersonalOffLineFYC">
         SELECT DISTINCT
         sales.SAL_MST_MOBILE mobileNo,
-        sum(case when date_format(policy.INS_MST_SEND_DATE,'%Y-%m')=date_format(now(),'%Y-%m') then COALESCE(policy.INS001_FYCTOTAL,0) else 0 end) FYC
+        ifnull(sum(policy.INS001_FYCTOTAL),0) FYC
         FROM sal001 sales LEFT JOIN ins003 p_sales on sales.SAL_MST_ID = p_sales.FK_SAL_MST_ID
         LEFT JOIN ins001 policy on policy.INS_MST_ID = p_sales.FK_INS_MST_ID
         WHERE policy.INS_MST_REPEAL != 1
+          AND DATE_FORMAT(policy.INS_MST_ACCEPT_DATE, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
           AND sales.SAL_MST_MOBILE in
           <foreach collection="list" item="mobileNo" index="index" open="(" close=")" separator=",">
               #{mobileNo,jdbcType=VARCHAR}

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

@@ -82,12 +82,13 @@
     <select id="checkTimePeriodConflict" resultType="int">
         SELECT count(1)
         FROM ag_mkt_schedule_task_tracking
-        WHERE practitioner_id = #{practitionerId,jdbcType=BIGINT}
+        WHERE
+            NOT ((task_time_end &lt; STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s'))
+                    OR
+                 (task_time_from &gt; STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
+                )
             AND to_days(track_time) = to_days(now())
-            AND
-               (task_time_from &gt; STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s') AND task_time_from &lt; STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
-            OR (task_time_from &lt; STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s') AND task_time_end &gt; STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
-            OR (task_time_end &gt; STR_TO_DATE(#{taskTimeFrom,jdbcType=VARCHAR}, '%H:%i:%s') AND task_time_end &lt; STR_TO_DATE(#{taskTimeEnd,jdbcType=VARCHAR}, '%H:%i:%s'))
+            AND practitioner_id = #{practitionerId,jdbcType=BIGINT}
     </select>
 
     <resultMap id="PersonalPEPScore" type="com.yd.dal.entity.practitioner.PersonalPEPScore">