Merge remote-tracking branch 'origin/dev_20200908_PEP_Statistics' into dev

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

@@ -2,6 +2,7 @@ package com.yd.api.practitioner;
 
 import com.yd.api.practitioner.service.PractitionerBasicInfoService;
 import com.yd.api.practitioner.service.PractitionerService;
+import com.yd.api.practitioner.service.ScheduleTrackService;
 import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
 import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
 import com.yd.api.practitioner.vo.media.MediaGetReqVO;
@@ -21,6 +22,7 @@ import com.yd.api.practitioner.vo.rank.PractitionerRankRequestVO;
 import com.yd.api.practitioner.vo.rank.PractitionerRankResponseVO;
 import com.yd.api.practitioner.vo.recruit.*;
 import com.yd.api.practitioner.vo.salestarget.*;
+import com.yd.api.practitioner.vo.sechedule.*;
 import com.yd.api.practitioner.vo.setting.*;
 import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO;
 import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO;
@@ -29,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+
 @Controller
 @RestController
 @RequestMapping("/practitioner")
@@ -38,7 +41,8 @@ public class PractitionerController {
     private PractitionerService practitionerService;
     @Autowired
     private PractitionerBasicInfoService practitionerBasicInfoService;
-
+    @Autowired
+    private ScheduleTrackService scheduleTrackService;
     /**
      * 经纪人登录
      * @param requestVO 请求数据
@@ -501,4 +505,75 @@ public class PractitionerController {
         result.setData(responseVO);
         return result;
     }
+
+    /**
+     * 新建日程
+     * @param requestVO
+     * @return
+     */
+    @RequestMapping("/addScheduleTrack")
+    public Object addScheduleTrack(@RequestBody AddScheduleTrackRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        AddScheduleTrackResponseVO responseVO = scheduleTrackService.insert(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    /**
+     * 根据经纪人id查询日程列表
+     * @param requestVO
+     * @return
+     */
+    @RequestMapping("/queryScheduleTrackList")
+    public Object queryScheduleTrackList(@RequestBody QueryScheduleTrackListRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        QueryScheduleTrackListResponseVO responseVO = scheduleTrackService.queryScheduleTrackList(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    /**
+     * 根据id删除日程记录
+     * @param requestVO
+     * @return
+     */
+    @RequestMapping("/deleteScheduleTrackById")
+    public Object deleteScheduleTrackById(@RequestBody DeleteScheduleTrackByIdRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        DeleteScheduleByIdResponseVO responseVO = scheduleTrackService.deleteScheduleTrackById(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    /**
+     * 查询战队PEP得分
+     * @param requestVO
+     * @return
+     */
+    @RequestMapping("/queryPEPScore")
+    public Object queryPEPScore(@RequestBody QueryPEPScoreRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        QueryPEPScoreResponseVO responseVO = scheduleTrackService.queryPEPScore(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    /**
+     * 查询个人PEP得分详情
+     * @param requestVO
+     * @return
+     */
+    @RequestMapping("/queryPEPScoreDetail")
+    public Object queryPEPScoreDetail(@RequestBody QueryPEPScoreDetailRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        QueryPEPScoreDetailResponseVO responseVO = scheduleTrackService.queryPEPScoreDetail(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
 }

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

+package com.yd.api.practitioner.service;
+
+import com.yd.api.practitioner.vo.sechedule.*;
+import org.springframework.stereotype.Service;
+
+@Service("scheduleTrackService")
+public interface ScheduleTrackService {
+    AddScheduleTrackResponseVO insert(AddScheduleTrackRequestVO requestVO);
+
+    QueryScheduleTrackListResponseVO queryScheduleTrackList(QueryScheduleTrackListRequestVO requestVO);
+
+    QueryPEPScoreResponseVO queryPEPScore(QueryPEPScoreRequestVO requestVO);
+
+    QueryPEPScoreDetailResponseVO queryPEPScoreDetail(QueryPEPScoreDetailRequestVO requestVO);
+
+    DeleteScheduleByIdResponseVO deleteScheduleTrackById(DeleteScheduleTrackByIdRequestVO requestVO);
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/AddScheduleTrackRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class AddScheduleTrackRequestVO {
+    private Long id;
+    private Long practitionerId;
+    private String notice;
+    private Integer taskType;
+    private Long referLeadsId;
+    private Long referPotentialId;
+    private Integer taskImportantTag;
+    private Integer isActive;
+    private String taskTimeFrom;
+    private String taskTimeEnd;
+    private Integer taskRoutineAtweek7;
+    private Integer taskRoutineAtweek6;
+    private Integer taskRoutineAtweek5;
+    private Integer taskRoutineAtweek4;
+    private Integer taskRoutineAtweek3;
+    private Integer taskRoutineAtweek2;
+    private Integer taskRoutineAtweek1;
+    private Long customerId;
+    private Long mdDropOptionId;
+    private String mdDropOptionName;
+    private Integer trackScore;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date trackTime;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/AddScheduleTrackResponseVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+
+@Data
+public class AddScheduleTrackResponseVO {
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/DeleteScheduleByIdResponseVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+
+@Data
+public class DeleteScheduleByIdResponseVO {
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/DeleteScheduleTrackByIdRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+
+@Data
+public class DeleteScheduleTrackByIdRequestVO {
+    private Long scheduleTrackId;
+    private Integer taskType;
+
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryPEPScoreDetailRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+
+@Data
+public class QueryPEPScoreDetailRequestVO {
+    private Long practitionerId;
+    private String time;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryPEPScoreDetailResponseVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.practitioner.PEPScoreDetail;
+import lombok.Data;
+
+@Data
+public class QueryPEPScoreDetailResponseVO {
+
+    private PEPScoreDetail detail;
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryPEPScoreRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+public class QueryPEPScoreRequestVO {
+    private Long practitionerId;
+
+    public Long getPractitionerId() {
+        return practitionerId;
+    }
+
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryPEPScoreResponseVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.practitioner.PersonalPEPScore;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class QueryPEPScoreResponseVO {
+    private Map<String, Object> average;
+    private PersonalPEPScore person;
+    private List<PersonalPEPScore> personalList;
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryScheduleTrackListRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+
+@Data
+public class QueryScheduleTrackListRequestVO {
+    private Long practitionerId;
+    private String trackTime;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryScheduleTrackListResponseVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import com.yd.api.result.CommonResult;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QueryScheduleTrackListResponseVO {
+    private List<ScheduleTrackVO> dataList;
+    private CommonResult commonResult;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/ScheduleTrackVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class ScheduleTrackVO {
+    private Long id;
+    private Long practitionerId;
+    private String notice;
+    private Integer taskType;
+    private Long referLeadsId;
+    private Long referPotentialId;
+    private Integer taskImportantTag;
+    private Integer isActive;
+    private String taskTimeFrom;
+    private String taskTimeEnd;
+    private Integer taskRoutineAtweek7;
+    private Integer taskRoutineAtweek6;
+    private Integer taskRoutineAtweek5;
+    private Integer taskRoutineAtweek4;
+    private Integer taskRoutineAtweek3;
+    private Integer taskRoutineAtweek2;
+    private Integer taskRoutineAtweek1;
+    private Long customerId;
+    private Long mdDropOptionId;
+    private String mdDropOptionName;
+    private Integer trackScore;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date trackTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdAt;
+    private Long createdBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updatedAt;
+    private Long updatedBy;
+    private Integer creatorType;
+    private Integer updatorType;
+}

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerPotentialAssignedTrack.java

@@ -70,5 +70,10 @@ public class AclPractitionerPotentialAssignedTrack implements Serializable {
 
     private Date trackTime;
 
+    /**
+     * 关联ag_mkt_schedule_task_tracking.id 日程表
+     */
+    private Long scheduleTaskTrackingId;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -92,5 +92,10 @@ public class MktLeadsAssignedTrack implements Serializable {
 
     private Date trackTime;
 
+    /**
+     * 关联ag_mkt_schedule_task_tracking.id 日程表
+     */
+    private Long scheduleTaskTrackingId;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/entity/practitioner/PEPScoreDetail.java

+package com.yd.dal.entity.practitioner;
+
+import lombok.Data;
+
+
+@Data
+public class PEPScoreDetail {
+    private String name;
+    private Long recruitScore;
+    private Long saleScore;
+    private Long coachScore;
+    private Long trainScore;
+    private Long meetingScore;
+}

yd-api/src/main/java/com/yd/dal/entity/practitioner/PersonalOffLineFYC.java

+package com.yd.dal.entity.practitioner;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PersonalOffLineFYC {
+    private String mobileNo;
+    private BigDecimal FYC;
+}

yd-api/src/main/java/com/yd/dal/entity/practitioner/PersonalPEPScore.java

+package com.yd.dal.entity.practitioner;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+@Data
+public class PersonalPEPScore {
+    private Long practitionerId;
+    private String name;
+    private String mobileNo;
+    private Long dayScore;
+    private Long weekScore;
+    private Long monthScore;
+    private BigDecimal FYC;
+    private Double rate;
+}

yd-api/src/main/java/com/yd/dal/entity/practitioner/PersonalSchedule.java

+package com.yd.dal.entity.practitioner;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class PersonalSchedule {
+    private Long practitionerId;
+    private List<ScheduleTrack> scheduleList;
+    private Map<String, Long> other;
+}

yd-api/src/main/java/com/yd/dal/entity/practitioner/ScheduleTrack.java

+package com.yd.dal.entity.practitioner;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class ScheduleTrack {
+    private Long id;
+    private Long practitionerId;
+    private String notice;
+    private Integer taskType;
+    private Long referLeadsId;
+    private Long referPotentialId;
+    private Integer taskImportantTag;
+    private Integer isActive;
+    private String taskTimeFrom;
+    private String taskTimeEnd;
+    private Integer taskRoutineAtweek7;
+    private Integer taskRoutineAtweek6;
+    private Integer taskRoutineAtweek5;
+    private Integer taskRoutineAtweek4;
+    private Integer taskRoutineAtweek3;
+    private Integer taskRoutineAtweek2;
+    private Integer taskRoutineAtweek1;
+    private Long customerId;
+    private Long mdDropOptionId;
+    private String mdDropOptionName;
+    private Integer trackScore;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date trackTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdAt;
+    private Long createdBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updatedAt;
+    private Long updatedBy;
+    private Integer creatorType;
+    private Integer updatorType;
+}

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsDashboardMapper.java

@@ -4,6 +4,7 @@ import com.yd.api.agms.vo.dashboard.StatisticsPractitionerInfo;
 import com.yd.api.agms.vo.dashboard.StatisticsSalesInfo;
 import com.yd.dal.entity.agms.dashboard.StatisticsOpportunityInfo;
 import com.yd.dal.entity.agms.dashboard.StatisticsPEPInfo;
+import com.yd.dal.entity.practitioner.PersonalOffLineFYC;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -22,4 +23,6 @@ public interface AgmsDashboardMapper {
     List<StatisticsPractitionerInfo> statisticsPractitioner(@Param("type")String type);
 
     List<StatisticsSalesInfo> statisticsSalesEG(@Param("type")String type, @Param("time")String time);
+
+    List<PersonalOffLineFYC> personalOffLineFYC(List<String> mobileNoList);
 }

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.java

@@ -30,4 +30,6 @@ public interface AclPractitionerPotentialAssignedTrackMapper {
     List<AclPractitionerPotentialAssignedTrack> findByPractitionerIdAndPotentialId(@Param("practitionerId")Long practitionerId, @Param("potentialId")Long potentialId);
 
     List<AclPractitionerPotentialAssignedTrack> findScoreByPractitionerIdAndDate(@Param("practitionerId")Long practitionerId, @Param("time")String time);
+
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }
\ No newline at end of file

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

@@ -31,4 +31,6 @@ public interface MktLeadsAssignedTrackMapper {
     MktLeadsAssignedTrack findByListNotesForCustomerId(Long customerId);
 
     List<SalesScoreDetail> getSalesScoreDetailByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("time") String time);
+
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }
\ No newline at end of file

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

+package com.yd.dal.mapper.marketing;
+
+import com.yd.dal.entity.practitioner.PersonalPEPScore;
+import com.yd.dal.entity.practitioner.PersonalSchedule;
+import com.yd.dal.entity.practitioner.ScheduleTrack;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ScheduleTrackMapper {
+
+    void insert(ScheduleTrack schedule);
+
+    List<ScheduleTrack> queryScheduleTrackList(@Param("practitionerId")Long practitionerId);
+
+    int checkTimePeriodConflict(@Param("trackTime")Date trackTime, @Param("taskTimeFrom")String taskTimeFrom,
+                                @Param("taskTimeEnd")String taskTimeEnd, @Param("practitionerId")Long practitionerId);
+
+    List<PersonalPEPScore> querySaleRecuitScoreFYC(@Param("list")List<Long> practitionerIdList);
+
+    List<Long> queryTeamAllPractitionerId(@Param("practitionerId")Long practitionerId);
+
+    List<PersonalSchedule> queryPersonalScheduleList(List<Long> practitionerIdList);
+
+    List<ScheduleTrack> queryPersonalScheduleListByTime(@Param("practitionerId")Long practitionerId, @Param("time")String time);
+
+    void deleteScheduleTrackById(@Param("scheduleTrackId")Long scheduleTrackId);
+
+    String queryNameByPractitionerId(Long practitionerId);
+}
+

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

@@ -4,6 +4,7 @@ import com.yd.api.agms.vo.dashboard.StatisticsPractitionerInfo;
 import com.yd.api.agms.vo.dashboard.StatisticsSalesInfo;
 import com.yd.dal.entity.agms.dashboard.StatisticsOpportunityInfo;
 import com.yd.dal.entity.agms.dashboard.StatisticsPEPInfo;
+import com.yd.dal.entity.practitioner.PersonalOffLineFYC;
 
 import java.util.List;
 
@@ -17,4 +18,6 @@ public interface AgmsDashboardDALService {
     List<StatisticsPractitionerInfo> statisticsPractitioner(String type);
 
     List<StatisticsSalesInfo> statisticsSalesEG(String type, String time);
+
+    List<PersonalOffLineFYC> offLineFYC(List<String> mobileNoList);
 }

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

@@ -4,6 +4,7 @@ import com.yd.api.agms.vo.dashboard.StatisticsPractitionerInfo;
 import com.yd.api.agms.vo.dashboard.StatisticsSalesInfo;
 import com.yd.dal.entity.agms.dashboard.StatisticsOpportunityInfo;
 import com.yd.dal.entity.agms.dashboard.StatisticsPEPInfo;
+import com.yd.dal.entity.practitioner.PersonalOffLineFYC;
 import com.yd.dal.mapper.agms.AgmsDashboardMapper;
 import com.yd.dal.service.agms.AgmsDashboardDALService;
 import com.yd.util.intercept.annotation.TargetDataSource;
@@ -138,4 +139,11 @@ public class AgmsDashboardDALServiceImpl implements AgmsDashboardDALService {
         getUnitPremium(statisticsSalesInfos);
         return statisticsSalesInfos;
     }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
+    public List<PersonalOffLineFYC> offLineFYC(List<String> mobileNoList) {
+        List<PersonalOffLineFYC> personalOffLineFYCList = agmsDashboardMapper.personalOffLineFYC(mobileNoList);
+        return personalOffLineFYCList;
+    }
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerPotentialAssignedTrackDALService.java

@@ -24,4 +24,6 @@ public interface AclPractitionerPotentialAssignedTrackDALService {
     List<AclPractitionerPotentialAssignedTrack> findScoreByPractitionerIdAndDate(Long practitionerId, String time);
 
     void update(AclPractitionerPotentialAssignedTrack assignedTrack);
+
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerPotentialAssignedTrackDALServiceImpl.java

@@ -55,4 +55,9 @@ public class AclPractitionerPotentialAssignedTrackDALServiceImpl implements AclP
     public void update(AclPractitionerPotentialAssignedTrack assignedTrack) {
         aclPractitionerPotentialAssignedTrackMapper.updateByPrimaryKeySelective(assignedTrack);
     }
+
+    @Override
+    public void deleteScheduleTrackById(Long scheduleTrackId) {
+        aclPractitionerPotentialAssignedTrackMapper.deleteScheduleTrackById(scheduleTrackId);
+    }
 }

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

@@ -55,4 +55,9 @@ public class MktLeadsAssignedTrackDALServiceImpl implements MktLeadsAssignedTrac
     public List<SalesScoreDetail> getSalesScoreDetailByPractitionerId(Long practitionerId, String time) {
         return mktLeadsAssignedTrackMapper.getSalesScoreDetailByPractitionerId(practitionerId, time);
     }
+
+    @Override
+    public void deleteScheduleTrackById(Long scheduleTrackId) {
+        mktLeadsAssignedTrackMapper.deleteScheduleTrackById(scheduleTrackId);
+    }
 }

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

@@ -32,4 +32,6 @@ public interface MktLeadsAssignedTrackDALService {
      * @return 跟进状态详情
      */
     List<SalesScoreDetail> getSalesScoreDetailByPractitionerId(Long practitionerId, String time);
+
+    void deleteScheduleTrackById(Long scheduleTrackId);
 }

yd-api/src/main/java/com/yd/dal/service/meta/MdDropOptionsDALService.java

@@ -6,6 +6,8 @@ import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.entity.meta.OptionsEGolden;
 
 import java.util.List;
+import java.util.Map;
+
 public interface MdDropOptionsDALService {
     List<MdDropOptions> findByDropMasterId(long dropMasterId);
 
@@ -40,4 +42,6 @@ public interface MdDropOptionsDALService {
     List<InsurerBranchInfo> findInsurerBranchInfoEG();
 
     List<MdDropOptions> findByDropMasterCodes(List<String> asList);
+
+    Map<Long, MdDropOptions> queryIdObjMapByByDropMasterCode(String masterCode);
 }

yd-api/src/main/java/com/yd/dal/service/meta/impl/MdDropOptionsDALServiceImpl.java

@@ -11,7 +11,9 @@ import com.yd.util.intercept.annotation.TargetDataSource;
 import com.yd.util.intercept.commons.DataSourceKey;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service("mdDropOptionsDALService")
 public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
@@ -111,4 +113,12 @@ public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
     public List<MdDropOptions> findByDropMasterCodes(List<String> masterCodeList) {
         return mdDropOptionsMapper.findByDropMasterCodes(masterCodeList);
     }
+
+    @Override
+    public Map<Long, MdDropOptions> queryIdObjMapByByDropMasterCode(String masterCode) {
+        Map<Long,MdDropOptions> optMap = new HashMap<>();
+        List<MdDropOptions> dropOptionsList = this.findByDropMasterCode(masterCode);
+        dropOptionsList.forEach(i->optMap.put(i.getId(), i));
+        return optMap;
+    }
 }

yd-api/src/main/java/com/yd/util/CommonUtil.java

@@ -16,6 +16,7 @@ import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.*;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1451,4 +1452,55 @@ public class CommonUtil {
 		}
 		return false;
 	}
+	/**
+	 * 根据日期获得星期
+	 * @param date
+	 * @return
+	 */
+	public static String getWeekOfDate(Date date) {
+		String[] weekDaysName = { "周日", "周一", "周二", "周三", "周四", "周五", "周六" };
+		String[] weekDaysCode = { "0", "1", "2", "3", "4", "5", "6" };
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		int intWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+		return weekDaysCode[intWeek];
+	}
+
+	/**
+	 * 给定时间段和星期几，计算该时间段内共有多少个给定的星期几
+	 * @param start 开始时间
+	 * @param end 结束时间
+	 * @param a 星期几，从星期一到星期天，分别用数字1-7表示
+	 * @return 星期几统计数
+	 */
+	public static long weekDayCount(Date start, Date end, int a){
+		long sumDay = 0;//计数
+		try{
+			Calendar startDate = Calendar.getInstance(); //开始时间
+			startDate.setTime(start);
+
+			Calendar endDate = Calendar.getInstance();//结束时间
+			endDate.setTime(end);
+
+			int SW = startDate.get(Calendar.DAY_OF_WEEK)-1;//开始日期是星期几
+			int EW = endDate.get(Calendar.DAY_OF_WEEK)-1;//结束日期是星期几
+
+			long diff = endDate.getTimeInMillis()-startDate.getTimeInMillis();
+			long days = diff / (1000 * 60 * 60 * 24);//给定时间段内一共有多少天
+			long w = Math.round(Math.ceil(((days+SW+(7-EW))/7.0)));//给定时间内，共有多少个星期
+			sumDay = w;//总的星期几统计数
+			if (a<SW) {
+				//给定的星期几小于起始日期的星期几，需要减少一天
+				sumDay--;
+			}
+			if (a>EW) {
+				//给定的星期几大于结束日期的星期几，需要减少一天
+				sumDay--;
+			}
+		}catch(Exception se){
+			se.printStackTrace();
+		}
+		return sumDay;
+	}
+
 }

yd-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -9,6 +9,7 @@
 
 ######################用户提示信息########################
 800000=执行成功！
+800001=执行失败！
 ##系统提示信息
 810001=token无效或者错误！
 820001=未查询到相应结果。
@@ -22,6 +23,7 @@
 830007=上传头像失败，请重新上传！
 830008=上传生活照失败，请重新上传！
 830009=上传微信二维码失败，请重新上传！
+830020=活动时间段冲突
 830010=该用户已经注册为银盾经纪人
 830011=该增员已存在！
 830012=请填写跟进时间！

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

@@ -281,4 +281,20 @@ where ps.practitioner_type_id = 28
         </choose>
         order by sum(policy.INS001_FYCTOTAL) desc
     </select>
+
+    <select id="personalOffLineFYC" resultType="com.yd.dal.entity.practitioner.PersonalOffLineFYC">
+        SELECT DISTINCT
+        sales.SAL_MST_MOBILE mobileNo,
+        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}
+          </foreach>
+        group by sales.SAL_MST_MOBILE
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -115,6 +115,9 @@
       <if test="trackTime != null">
         track_time,
       </if>
+      <if test="scheduleTaskTrackingId != null">
+        schedule_task_tracking_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="practitionerPotentialId != null">
@@ -159,6 +162,9 @@
       <if test="trackTime != null">
         #{trackTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="scheduleTaskTrackingId != null">
+        #{scheduleTaskTrackingId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <insert id="insertList" parameterType="java.util.List" useGeneratedKeys="true" >
@@ -325,4 +331,9 @@
       </choose>
 
     </select>
+
+  <delete id="deleteScheduleTrackById" parameterType="java.lang.Long">
+    delete from ag_acl_practitioner_potential_assigned_track
+    where schedule_task_tracking_id = #{scheduleTrackId,jdbcType=BIGINT}
+  </delete>
 </mapper>
\ No newline at end of file

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

@@ -101,6 +101,9 @@
       <if test="trackTime != null">
         track_time,
       </if>
+      <if test="scheduleTaskTrackingId != null">
+        schedule_task_tracking_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderId != null">
@@ -151,6 +154,9 @@
       <if test="trackTime != null">
         #{trackTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="scheduleTaskTrackingId != null">
+        #{scheduleTaskTrackingId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsAssignedTrack">
@@ -372,4 +378,9 @@
         group by t.md_drop_option_id,o.drop_option_order
         ORDER BY o.drop_option_order
   </select>
+
+  <delete id="deleteScheduleTrackById" parameterType="java.lang.Long">
+    delete from ag_mkt_leads_assigned_track
+    where schedule_task_tracking_id = #{scheduleTrackId,jdbcType=BIGINT}
+  </delete>
 </mapper>
\ No newline at end of file