Skip to content

Y
yd-backend
Commit 7ee2b80b by Water Wang
Options

resolve conflict

parents 2687cfd3 d435f32c
Showing with 798 additions and 28 deletions
yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java
...@@ -11,6 +11,8 @@ import com.yd.api.practitioner.vo.rank.PractitionerRankResponseVO; ...@@ -11,6 +11,8 @@ import com.yd.api.practitioner.vo.rank.PractitionerRankResponseVO;
import com.yd.api.practitioner.vo.recruit.*; import com.yd.api.practitioner.vo.recruit.*;
import com.yd.api.practitioner.vo.salestarget.*; import com.yd.api.practitioner.vo.salestarget.*;
import com.yd.api.practitioner.vo.setting.*; import com.yd.api.practitioner.vo.setting.*;
import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO;
import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO;
import com.yd.api.result.JsonResult; import com.yd.api.result.JsonResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -219,6 +221,7 @@ public class PractitionerController { ...@@ -219,6 +221,7 @@ public class PractitionerController {
} }
/** /**
<<<<<<< HEAD
* 经纪人-ydLife查询此经纪人总分数 按年月周日 分别统计 新增商机个数 达成率 * 经纪人-ydLife查询此经纪人总分数 按年月周日 分别统计 新增商机个数 达成率
* @param requestVO 请求数据 * @param requestVO 请求数据
* @return 响应数据 * @return 响应数据
...@@ -315,4 +318,17 @@ public class PractitionerController { ...@@ -315,4 +318,17 @@ public class PractitionerController {
result.setData(responseVO); result.setData(responseVO);
return result; return result;
} }
/**
* 体系团队成员信息查询
* @param requestVO 请求数据
* @return AnnouncementQueryResponseVO
*/
@RequestMapping("/subordinateSystemMemberQuery")
public Object subordinateSystemMemberQuery(@RequestBody SubordinateSystemMemberQueryRequestVO requestVO){
JsonResult result = new JsonResult();
SubordinateSystemMemberQueryResponseVO responseVO = practitionerService.subordinateSystemMemberQuery(requestVO);
result.setData(responseVO);
result.addResult(responseVO);
return result;
}
} }
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerService.java
...@@ -10,6 +10,8 @@ import com.yd.api.practitioner.vo.rank.PractitionerRankResponseVO; ...@@ -10,6 +10,8 @@ import com.yd.api.practitioner.vo.rank.PractitionerRankResponseVO;
import com.yd.api.practitioner.vo.recruit.*; import com.yd.api.practitioner.vo.recruit.*;
import com.yd.api.practitioner.vo.salestarget.*; import com.yd.api.practitioner.vo.salestarget.*;
import com.yd.api.practitioner.vo.setting.*; import com.yd.api.practitioner.vo.setting.*;
import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO;
import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service("practitionerService") @Service("practitionerService")
...@@ -159,4 +161,10 @@ public interface PractitionerService { ...@@ -159,4 +161,10 @@ public interface PractitionerService {
* @return * @return
*/ */
SalesPerformanceForecastListQueryResponseVO salesPerformanceForecastListQuery(SalesPerformanceForecastListQueryRequestVO requestVO); SalesPerformanceForecastListQueryResponseVO salesPerformanceForecastListQuery(SalesPerformanceForecastListQueryRequestVO requestVO);
/**
* 体系团队成员信息查询
* @param requestVO
* @return
*/
SubordinateSystemMemberQueryResponseVO subordinateSystemMemberQuery(SubordinateSystemMemberQueryRequestVO requestVO);
} }
yd-api/src/main/java/com/yd/api/practitioner/vo/rank/AclCustomerFortuneStatistics.java
...@@ -4,7 +4,7 @@ import java.io.Serializable; ...@@ -4,7 +4,7 @@ import java.io.Serializable;
public class AclCustomerFortuneStatistics implements Serializable { public class AclCustomerFortuneStatistics implements Serializable {
private Integer rank; private Integer rank;
private Long customerId; private Long customerId;
private String practitionerId; private Long practitionerId;
private String name; private String name;
private Long subordinateSystemId;//所属体系id private Long subordinateSystemId;//所属体系id
private String subordinateSystemName;//所属体系名称 private String subordinateSystemName;//所属体系名称
...@@ -29,11 +29,11 @@ public class AclCustomerFortuneStatistics implements Serializable { ...@@ -29,11 +29,11 @@ public class AclCustomerFortuneStatistics implements Serializable {
this.customerId = customerId; this.customerId = customerId;
} }
public String getPractitionerId() { public Long getPractitionerId() {
return practitionerId; return practitionerId;
} }
public void setPractitionerId(String practitionerId) { public void setPractitionerId(Long practitionerId) {
this.practitionerId = practitionerId; this.practitionerId = practitionerId;
} }
......
yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemMemberInfo.java 0 → 100644
package com.yd.api.practitioner.vo.subordinate;
public class SubordinateSystemMemberInfo {
private Long practitionerId;
private String name;
private String levelCode;
private String levelName;
private Double fyp;
private Double fyc;
private Integer count;
public Long getPractitionerId() {
return practitionerId;
}
public void setPractitionerId(Long practitionerId) {
this.practitionerId = practitionerId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getLevelCode() {
return levelCode;
}
public void setLevelCode(String levelCode) {
this.levelCode = levelCode;
}
public String getLevelName() {
return levelName;
}
public void setLevelName(String levelName) {
this.levelName = levelName;
}
public Double getFyp() {
return fyp;
}
public void setFyp(Double fyp) {
this.fyp = fyp;
}
public Double getFyc() {
return fyc;
}
public void setFyc(Double fyc) {
this.fyc = fyc;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemMemberQueryRequestVO.java 0 → 100644
package com.yd.api.practitioner.vo.subordinate;
public class SubordinateSystemMemberQueryRequestVO {
private Long practitionerId;
private Integer time;//1=month,3=quarter,2=year
private Integer type;//1=online,2=offLine
public Long getPractitionerId() {
return practitionerId;
}
public void setPractitionerId(Long practitionerId) {
this.practitionerId = practitionerId;
}
public Integer getTime() {
return time;
}
public void setTime(Integer time) {
this.time = time;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemMemberQueryResponseVO.java 0 → 100644
package com.yd.api.practitioner.vo.subordinate;
import com.yd.api.result.CommonResult;
import java.util.List;
public class SubordinateSystemMemberQueryResponseVO {
private Long id;
private String subordinateSystemName;
private String contactName;
private String contactNo;
private String remark;
private SubordinateSystemStatisticInfo statisticInfo;
private List<SubordinateSystemMemberInfo> memberInfoList;
private CommonResult commonResult;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSubordinateSystemName() {
return subordinateSystemName;
}
public void setSubordinateSystemName(String subordinateSystemName) {
this.subordinateSystemName = subordinateSystemName;
}
public String getContactName() {
return contactName;
}
public void setContactName(String contactName) {
this.contactName = contactName;
}
public String getContactNo() {
return contactNo;
}
public void setContactNo(String contactNo) {
this.contactNo = contactNo;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public SubordinateSystemStatisticInfo getStatisticInfo() {
return statisticInfo;
}
public void setStatisticInfo(SubordinateSystemStatisticInfo statisticInfo) {
this.statisticInfo = statisticInfo;
}
public List<SubordinateSystemMemberInfo> getMemberInfoList() {
return memberInfoList;
}
public void setMemberInfoList(List<SubordinateSystemMemberInfo> memberInfoList) {
this.memberInfoList = memberInfoList;
}
public CommonResult getCommonResult() {
return commonResult;
}
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/SubordinateSystemStatisticInfo.java 0 → 100644
package com.yd.api.practitioner.vo.subordinate;
public class SubordinateSystemStatisticInfo {
private Double fyc;
private Double fyp;
private Integer count;
private Double completionRate;
public Double getFyc() {
return fyc;
}
public void setFyc(Double fyc) {
this.fyc = fyc;
}
public Double getFyp() {
return fyp;
}
public void setFyp(Double fyp) {
this.fyp = fyp;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public Double getCompletionRate() {
return completionRate;
}
public void setCompletionRate(Double completionRate) {
this.completionRate = completionRate;
}
}
yd-api/src/main/java/com/yd/dal/entity/customer/AclCustomerFortune.java 0 → 100644
package com.yd.dal.entity.customer;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* ag_acl_customer_fortune
* @author
*/
@Data
public class AclCustomerFortune implements Serializable {
/**
* serial id
*/
private Long id;
/**
* FK ag_acl_customer_share.id
*/
private Long shareId;
/**
* FK ag_acl_customer.id
*/
private Long customerId;
/**
* FK ag_po_order.id
*/
private Long orderId;
private Date orderDate;
private BigDecimal orderPrice;
/**
* FK ag_product_plan_commission，ag_product_life_plan_commission银盾来佣佣金率
*/
private BigDecimal commissionRate;
/**
* 银盾来佣佣金
*/
private BigDecimal commissionAmount;
/**
* FK ag_product_plan_commission，ag_product_life_plan_commission公告佣金率
*/
private BigDecimal announcementCommissionRate;
/**
* 公告佣金
*/
private BigDecimal announcementCommissionAmount;
/**
* FK ag_acl_channel_referral_rate个人职级佣金率
*/
private BigDecimal gradeCommissionRate;
/**
* %=referral amount / order price
*/
private BigDecimal referralRate;
private BigDecimal referralAmount;
/**
* 扣除6个点的企业增值税（6%）
*/
private BigDecimal referralAmountAfterValueadded;
/**
* 0=No, 1=Yes
*/
private Integer isTax;
private BigDecimal taxAmount;
private BigDecimal netAmount;
/**
* FK ag_md_mk_campaign.id
*/
private Long campaignId;
/**
* 可提现日期，在生产记录时就算好
*/
private Date withdrawableDate;
/**
* FK ag_acl_customer_fortune_withdraw.id 提现表的id
*/
private Long withdrawedId;
/**
* FK ag_acl_customer_fortune_pay.id 支付表的id
*/
private Long fortunePayedId;
/**
* 创建时间
*/
private Date createdAt;
/**
* FK ag_acl_customer.id
*/
private Long createdBy;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerSetting.java 0 → 100644
package com.yd.dal.entity.customer;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* ag_acl_practitioner_setting
* @author
*/
@Data
public class AclPractitionerSetting implements Serializable {
/**
* serial id
*/
private Long id;
/**
* FK ag_acl_practitioner.id
*/
private Long practitionerId;
/**
* FK ag_md_drop_options.id,经纪人:1产险、2寿险、3商业
*/
private Long practitionerTypeId;
/**
* FK ag_md_drop_options.id,经纪人分成5个级别 ： S2 、S1、 A3、 A2、 A1,level决定佣金比例
*/
private Long practitionerLevel;
/**
* 比例有效期起日
*/
private Date levelStartDate;
/**
* 比例有效期终日
*/
private Date levelEndDate;
/**
* 备注
*/
private String remark;
/**
* 0=No, 1=Yes
*/
private Integer isActive;
/**
* 建置日
*/
private Date createdAt;
/**
* 建置者
*/
private Long createdBy;
/**
* 更新日
*/
private Date updatedAt;
private Long updatedBy;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
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.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
/**
* 经纪人(或团队长)商机目标设定
*/
@Data @Data
public class MktLeadsGoals { public class MktLeadsGoals implements Serializable {
/** /**
* serial id * serial id
*/ */
...@@ -95,4 +93,6 @@ public class MktLeadsGoals { ...@@ -95,4 +93,6 @@ public class MktLeadsGoals {
private Date updatedAt; private Date updatedAt;
private Long updatedBy; private Long updatedBy;
private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/customer/AclCustomerFortuneMapper.java 0 → 100644
package com.yd.dal.mapper.customer;
import com.yd.api.practitioner.vo.rank.AclCustomerFortuneStatistics;
import com.yd.dal.entity.customer.AclCustomerFortune;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface AclCustomerFortuneMapper {
int deleteByPrimaryKey(Long id);
int insert(AclCustomerFortune record);
int insertSelective(AclCustomerFortune record);
AclCustomerFortune selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(AclCustomerFortune record);
int updateByPrimaryKey(AclCustomerFortune record);
List<AclCustomerFortuneStatistics> findBySubordinateSystemStatistics(@Param("subordinateSystemId") Long subordinateSystemId, @Param("time") Integer time);
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java
...@@ -44,4 +44,6 @@ public interface AclPractitionerMapper { ...@@ -44,4 +44,6 @@ public interface AclPractitionerMapper {
List<AclPractitioner> findForSubordinateIdByPractitionerId(Long practitionerId); List<AclPractitioner> findForSubordinateIdByPractitionerId(Long practitionerId);
List<PlayerSalesActivityInfo> playerSalesActivityQuery(@Param("practitionerId") Long practitionerId,@Param("optionsId") Long optionsId); List<PlayerSalesActivityInfo> playerSalesActivityQuery(@Param("practitionerId") Long practitionerId,@Param("optionsId") Long optionsId);
List<AclPractitioner> findBySubordinateSystemId(@Param("subordinateSystemId")Long subordinateSystemId);
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerSettingMapper.java 0 → 100644
package com.yd.dal.mapper.customer;
import com.yd.dal.entity.customer.AclPractitionerSetting;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface AclPractitionerSettingMapper {
int deleteByPrimaryKey(Long id);
int insert(AclPractitionerSetting record);
int insertSelective(AclPractitionerSetting record);
AclPractitionerSetting selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(AclPractitionerSetting record);
int updateByPrimaryKey(AclPractitionerSetting record);
List<AclPractitionerSetting> findByPractitionerIdList(@Param("practitionerIds") List<Long> practitionerIds);
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerSubordinateSystemMapper.java
...@@ -2,6 +2,9 @@ package com.yd.dal.mapper.customer; ...@@ -2,6 +2,9 @@ package com.yd.dal.mapper.customer;
import com.yd.dal.entity.customer.AclPractitionerSubordinateSystem; import com.yd.dal.entity.customer.AclPractitionerSubordinateSystem;
import com.yd.dal.entity.customer.practitioner.PractitionerSubordinateInfo; import com.yd.dal.entity.customer.practitioner.PractitionerSubordinateInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.List; import java.util.List;
...@@ -23,4 +26,6 @@ public interface AclPractitionerSubordinateSystemMapper { ...@@ -23,4 +26,6 @@ public interface AclPractitionerSubordinateSystemMapper {
AclPractitionerSubordinateSystem findByPractitionerId(Long practitionerId); AclPractitionerSubordinateSystem findByPractitionerId(Long practitionerId);
List<AclPractitionerSubordinateSystem> findByOwnerPractitionerId(Long practitionerId); List<AclPractitionerSubordinateSystem> findByOwnerPractitionerId(Long practitionerId);
List<AclPractitionerSubordinateSystem> findByOwner(@Param("practitionerId") Long practitionerId);
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/marketing/MktLeadsGoalsMapper.java
package com.yd.dal.mapper.marketing; package com.yd.dal.mapper.marketing;
import com.yd.dal.entity.marketing.MktLeadsGoals;import org.apache.ibatis.annotations.Param;import java.util.List; import com.yd.dal.entity.marketing.MktLeadsGoals;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface MktLeadsGoalsMapper { public interface MktLeadsGoalsMapper {
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
...@@ -20,4 +23,6 @@ public interface MktLeadsGoalsMapper { ...@@ -20,4 +23,6 @@ public interface MktLeadsGoalsMapper {
List<MktLeadsGoals> selectByMktLeadsGoals(MktLeadsGoals mktLeadsGoals); List<MktLeadsGoals> selectByMktLeadsGoals(MktLeadsGoals mktLeadsGoals);
List<MktLeadsGoals> selectByPractitionerIds(@Param("practitionerIds") List<Long> practitionerIds,@Param("year") Integer year); List<MktLeadsGoals> selectByPractitionerIds(@Param("practitionerIds") List<Long> practitionerIds,@Param("year") Integer year);
List<MktLeadsGoals> findByTypeAndTimeUnitAndSubordinateSystemId(@Param("goalsType") Integer goalsType, @Param("statisticTimeUnit")Integer statisticTimeUnit, @Param("subordinateSystemId")Long subordinateSystemId);
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/service/customer/AclCustomerFortuneDALService.java 0 → 100644
package com.yd.dal.service.customer;
import com.yd.api.practitioner.vo.rank.AclCustomerFortuneStatistics;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("aclCustomerFortuneDALService")
public interface AclCustomerFortuneDALService {
List<AclCustomerFortuneStatistics> findBySubordinateSystemStatistics(Long subordinateSystemId, Integer time);
}
yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java
...@@ -96,4 +96,10 @@ public interface AclPractitionerDALService { ...@@ -96,4 +96,10 @@ public interface AclPractitionerDALService {
* @return * @return
*/ */
List<PlayerSalesActivityInfo> playerSalesActivityQuery(Long practitionerId, Long optionsId); List<PlayerSalesActivityInfo> playerSalesActivityQuery(Long practitionerId, Long optionsId);
/**
* 根据体系id查询经纪人
* @param subordinateSystemId 体系id
* @return
*/
List<AclPractitioner> findBySubordinateSystemId(Long subordinateSystemId);
} }
yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerSettingDALService.java 0 → 100644
package com.yd.dal.service.customer;
import com.yd.dal.entity.customer.AclPractitionerSetting;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("aclPractitionerSettingDALService")
public interface AclPractitionerSettingDALService {
List<AclPractitionerSetting> findByPractitionerIdList(List<Long> practitionerIds);
}
yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerSubordinateSystemDALService.java
...@@ -10,7 +10,11 @@ import java.util.List; ...@@ -10,7 +10,11 @@ import java.util.List;
public interface AclPractitionerSubordinateSystemDALService { public interface AclPractitionerSubordinateSystemDALService {
PractitionerSubordinateInfo findSubordinateInfo(Long subordinateId); PractitionerSubordinateInfo findSubordinateInfo(Long subordinateId);
AclPractitionerSubordinateSystem findByPractitionerId(Long practitionerId); AclPractitionerSubordinateSystem findByPractitionerId(Long practitionerId);
List<AclPractitionerSubordinateSystem> findByOwnerPractitionerId(Long practitionerId); List<AclPractitionerSubordinateSystem> findByOwnerPractitionerId(Long practitionerId);
List<AclPractitionerSubordinateSystem> findByOwner(Long practitionerId);
} }
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclCustomerFortuneDALServiceImpl.java 0 → 100644
package com.yd.dal.service.customer.impl;
import com.yd.api.practitioner.vo.rank.AclCustomerFortuneStatistics;
import com.yd.dal.mapper.customer.AclCustomerFortuneMapper;
import com.yd.dal.service.customer.AclCustomerFortuneDALService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service("aclCustomerFortuneDALService")
public class AclCustomerFortuneDALServiceImpl implements AclCustomerFortuneDALService {
@Resource
private AclCustomerFortuneMapper aclCustomerFortuneMapper;
@Override
public List<AclCustomerFortuneStatistics> findBySubordinateSystemStatistics(Long subordinateSystemId, Integer time) {
return aclCustomerFortuneMapper.findBySubordinateSystemStatistics(subordinateSystemId,time);
}
}
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java
...@@ -96,6 +96,10 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService ...@@ -96,6 +96,10 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
@Override @Override
public List<PlayerSalesActivityInfo> playerSalesActivityQuery(Long practitionerId, Long optionsId) { public List<PlayerSalesActivityInfo> playerSalesActivityQuery(Long practitionerId, Long optionsId) {
return aclPractitionerMapper.playerSalesActivityQuery(practitionerId,optionsId); return aclPractitionerMapper.playerSalesActivityQuery(practitionerId, optionsId);
}
@Override
public List<AclPractitioner> findBySubordinateSystemId(Long subordinateSystemId) {
return aclPractitionerMapper.findBySubordinateSystemId(subordinateSystemId);
} }
} }
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerSettingDALServiceImpl.java 0 → 100644
package com.yd.dal.service.customer.impl;
import com.yd.dal.entity.customer.AclPractitionerSetting;
import com.yd.dal.mapper.customer.AclPractitionerSettingMapper;
import com.yd.dal.service.customer.AclPractitionerSettingDALService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("aclPractitionerSettingDALService")
public class AclPractitionerSettingDALServiceImpl implements AclPractitionerSettingDALService {
@Autowired
private AclPractitionerSettingMapper aclPractitionerSettingMapper;
@Override
public List<AclPractitionerSetting> findByPractitionerIdList(List<Long> practitionerIds) {
return aclPractitionerSettingMapper.findByPractitionerIdList(practitionerIds);
}
}
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerSubordinateSystemDALServiceImpl.java
...@@ -36,4 +36,8 @@ public class AclPractitionerSubordinateSystemDALServiceImpl implements AclPracti ...@@ -36,4 +36,8 @@ public class AclPractitionerSubordinateSystemDALServiceImpl implements AclPracti
public List<AclPractitionerSubordinateSystem> findByOwnerPractitionerId(Long practitionerId) { public List<AclPractitionerSubordinateSystem> findByOwnerPractitionerId(Long practitionerId) {
return aclPractitionerSubordinateSystemMapper.findByOwnerPractitionerId(practitionerId); return aclPractitionerSubordinateSystemMapper.findByOwnerPractitionerId(practitionerId);
} }
@Override
public List<AclPractitionerSubordinateSystem> findByOwner(Long practitionerId) {
return aclPractitionerSubordinateSystemMapper.findByOwner(practitionerId);
}
} }
yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktLeadsGoalsDALServiceImpl.java
...@@ -4,10 +4,7 @@ import com.yd.dal.entity.marketing.MktLeadsGoals; ...@@ -4,10 +4,7 @@ import com.yd.dal.entity.marketing.MktLeadsGoals;
import com.yd.dal.mapper.marketing.MktLeadsGoalsMapper; import com.yd.dal.mapper.marketing.MktLeadsGoalsMapper;
import com.yd.dal.service.marketing.MktLeadsGoalsDALService; import com.yd.dal.service.marketing.MktLeadsGoalsDALService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List; import java.util.List;
@Service("mktLeadsGoalsDALService") @Service("mktLeadsGoalsDALService")
...@@ -36,4 +33,8 @@ public class MktLeadsGoalsDALServiceImpl implements MktLeadsGoalsDALService { ...@@ -36,4 +33,8 @@ public class MktLeadsGoalsDALServiceImpl implements MktLeadsGoalsDALService {
return mktLeadsGoalsMapper.selectByPractitionerIds( practitionerIds, year); return mktLeadsGoalsMapper.selectByPractitionerIds( practitionerIds, year);
} }
@Override
public List<MktLeadsGoals> findByTypeAndTimeUnitAndSubordinateSystemId(Integer goalsType, Integer statisticTimeUnit, Long subordinateSystemId) {
return mktLeadsGoalsMapper.findByTypeAndTimeUnitAndSubordinateSystemId(goalsType,statisticTimeUnit,subordinateSystemId);
}
} }
yd-api/src/main/java/com/yd/dal/service/marketing/MktLeadsGoalsDALService.java
package com.yd.dal.service.marketing; package com.yd.dal.service.marketing;
import com.yd.dal.entity.marketing.MktLeadsGoals; import com.yd.dal.entity.marketing.MktLeadsGoals;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List; import java.util.List;
@Service("mktLeadsGoalsDALService")
public interface MktLeadsGoalsDALService { public interface MktLeadsGoalsDALService {
void saveMktLeadsGoals(MktLeadsGoals mktLeadsGoals); void saveMktLeadsGoals(MktLeadsGoals mktLeadsGoals);
...@@ -14,4 +13,6 @@ public interface MktLeadsGoalsDALService { ...@@ -14,4 +13,6 @@ public interface MktLeadsGoalsDALService {
List<MktLeadsGoals> findByMktLeadsGoals(MktLeadsGoals mktLeadsGoals); List<MktLeadsGoals> findByMktLeadsGoals(MktLeadsGoals mktLeadsGoals);
List<MktLeadsGoals> selectByPractitionerIds(List<Long> practitionerIds, int year); List<MktLeadsGoals> selectByPractitionerIds(List<Long> practitionerIds, int year);
List<MktLeadsGoals> findByTypeAndTimeUnitAndSubordinateSystemId(Integer goalsType, Integer statisticTimeUnit, Long subordinateSystemId);
} }
yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
...@@ -758,4 +758,10 @@ ...@@ -758,4 +758,10 @@
group by p.id group by p.id
order by scoreDay desc ,scoreWeek desc ,scoreMonth desc ,addOpportunityNum desc order by scoreDay desc ,scoreWeek desc ,scoreMonth desc ,addOpportunityNum desc
</select> </select>
<select id="findBySubordinateSystemId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ag_acl_practitioner
where subordinate_system_id = #{subordinateSystemId,jdbcType=BIGINT} and is_active = 1
</select>
</mapper> </mapper>
\ No newline at end of file
yd-api/src/main/resources/mapper/customer/AclPractitionerSettingMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.dal.mapper.customer.AclPractitionerSettingMapper">
<resultMap id="BaseResultMap" type="com.yd.dal.entity.customer.AclPractitionerSetting">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
<result column="practitioner_type_id" jdbcType="BIGINT" property="practitionerTypeId" />
<result column="practitioner_level" jdbcType="BIGINT" property="practitionerLevel" />
<result column="level_start_date" jdbcType="DATE" property="levelStartDate" />
<result column="level_end_date" jdbcType="DATE" property="levelEndDate" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="is_active" jdbcType="INTEGER" property="isActive" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="created_by" jdbcType="BIGINT" property="createdBy" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
</resultMap>
<sql id="Base_Column_List">
id, practitioner_id, practitioner_type_id, practitioner_level, level_start_date,
level_end_date, remark, is_active, created_at, created_by, updated_at, updated_by
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ag_acl_practitioner_setting
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from ag_acl_practitioner_setting
where id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerSetting" useGeneratedKeys="true">
insert into ag_acl_practitioner_setting (practitioner_id, practitioner_type_id,
practitioner_level, level_start_date, level_end_date,
remark, is_active, created_at,
created_by, updated_at, updated_by
)
values (#{practitionerId,jdbcType=BIGINT}, #{practitionerTypeId,jdbcType=BIGINT},
#{practitionerLevel,jdbcType=BIGINT}, #{levelStartDate,jdbcType=DATE}, #{levelEndDate,jdbcType=DATE},
#{remark,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP},
#{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerSetting" useGeneratedKeys="true">
insert into ag_acl_practitioner_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="practitionerId != null">
practitioner_id,
</if>
<if test="practitionerTypeId != null">
practitioner_type_id,
</if>
<if test="practitionerLevel != null">
practitioner_level,
</if>
<if test="levelStartDate != null">
level_start_date,
</if>
<if test="levelEndDate != null">
level_end_date,
</if>
<if test="remark != null">
remark,
</if>
<if test="isActive != null">
is_active,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="createdBy != null">
created_by,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="updatedBy != null">
updated_by,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="practitionerId != null">
#{practitionerId,jdbcType=BIGINT},
</if>
<if test="practitionerTypeId != null">
#{practitionerTypeId,jdbcType=BIGINT},
</if>
<if test="practitionerLevel != null">
#{practitionerLevel,jdbcType=BIGINT},
</if>
<if test="levelStartDate != null">
#{levelStartDate,jdbcType=DATE},
</if>
<if test="levelEndDate != null">
#{levelEndDate,jdbcType=DATE},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="isActive != null">
#{isActive,jdbcType=INTEGER},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="createdBy != null">
#{createdBy,jdbcType=BIGINT},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
#{updatedBy,jdbcType=BIGINT},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclPractitionerSetting">
update ag_acl_practitioner_setting
<set>
<if test="practitionerId != null">
practitioner_id = #{practitionerId,jdbcType=BIGINT},
</if>
<if test="practitionerTypeId != null">
practitioner_type_id = #{practitionerTypeId,jdbcType=BIGINT},
</if>
<if test="practitionerLevel != null">
practitioner_level = #{practitionerLevel,jdbcType=BIGINT},
</if>
<if test="levelStartDate != null">
level_start_date = #{levelStartDate,jdbcType=DATE},
</if>
<if test="levelEndDate != null">
level_end_date = #{levelEndDate,jdbcType=DATE},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="isActive != null">
is_active = #{isActive,jdbcType=INTEGER},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="createdBy != null">
created_by = #{createdBy,jdbcType=BIGINT},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.customer.AclPractitionerSetting">
update ag_acl_practitioner_setting
set practitioner_id = #{practitionerId,jdbcType=BIGINT},
practitioner_type_id = #{practitionerTypeId,jdbcType=BIGINT},
practitioner_level = #{practitionerLevel,jdbcType=BIGINT},
level_start_date = #{levelStartDate,jdbcType=DATE},
level_end_date = #{levelEndDate,jdbcType=DATE},
remark = #{remark,jdbcType=VARCHAR},
is_active = #{isActive,jdbcType=INTEGER},
created_at = #{createdAt,jdbcType=TIMESTAMP},
created_by = #{createdBy,jdbcType=BIGINT},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="findByPractitionerIdList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ag_acl_practitioner_setting
where practitioner_id in
<foreach collection="practitionerIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper>
\ No newline at end of file
yd-api/src/main/resources/mapper/customer/AclPractitionerSubordinateSystemMapper.xml
...@@ -254,4 +254,10 @@ ...@@ -254,4 +254,10 @@
from ag_acl_practitioner_subordinate_system from ag_acl_practitioner_subordinate_system
where owner_practitioner_id = #{practitionerId,jdbcType=BIGINT} where owner_practitioner_id = #{practitionerId,jdbcType=BIGINT}
</select> </select>
<select id="findByOwner" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ag_acl_practitioner_subordinate_system
where owner_practitioner_id = #{practitionerId,jdbcType=BIGINT} and is_active = 1
</select>
</mapper> </mapper>
\ No newline at end of file
yd-api/src/main/resources/mapper/marketing/MktLeadsGoalsMapper.xml
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.dal.mapper.marketing.MktLeadsGoalsMapper"> <mapper namespace="com.yd.dal.mapper.marketing.MktLeadsGoalsMapper">
<resultMap id="BaseResultMap" type="com.yd.dal.entity.marketing.MktLeadsGoals"> <resultMap id="BaseResultMap" type="com.yd.dal.entity.marketing.MktLeadsGoals">
<!--@mbg.generated-->
<!--@Table ag_mkt_leads_goals-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="goals_type" jdbcType="INTEGER" property="goalsType" /> <result column="goals_type" jdbcType="INTEGER" property="goalsType" />
<result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" /> <result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
...@@ -24,25 +22,21 @@ ...@@ -24,25 +22,21 @@
<result column="updated_by" jdbcType="BIGINT" property="updatedBy" /> <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated-->
id, goals_type, practitioner_id, subordinate_system_id, subordinate_system_name, id, goals_type, practitioner_id, subordinate_system_id, subordinate_system_name,
current_year, statistic_time_unit, seq_time, premium, commission, pieces, piece_average_premium, current_year, statistic_time_unit, seq_time, premium, commission, pieces, piece_average_premium,
current_version, is_active, created_at, created_by, updated_at, updated_by current_version, is_active, created_at, created_by, updated_at, updated_by
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from ag_mkt_leads_goals from ag_mkt_leads_goals
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from ag_mkt_leads_goals delete from ag_mkt_leads_goals
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals" useGeneratedKeys="true"> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into ag_mkt_leads_goals (goals_type, practitioner_id, subordinate_system_id, insert into ag_mkt_leads_goals (goals_type, practitioner_id, subordinate_system_id,
subordinate_system_name, current_year, statistic_time_unit, subordinate_system_name, current_year, statistic_time_unit,
seq_time, premium, commission, seq_time, premium, commission,
...@@ -50,15 +44,13 @@ ...@@ -50,15 +44,13 @@
is_active, created_at, created_by, is_active, created_at, created_by,
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=DECIMAL}, #{commission,jdbcType=DECIMAL}, #{seqTime,jdbcType=INTEGER}, #{premium,jdbcType=DECIMAL}, #{commission,jdbcType=DECIMAL},
#{pieces,jdbcType=INTEGER}, #{pieceAveragePremium,jdbcType=DECIMAL}, #{currentVersion,jdbcType=TIMESTAMP}, #{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>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into ag_mkt_leads_goals
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="goalsType != null"> <if test="goalsType != null">
goals_type, goals_type,
...@@ -167,7 +159,6 @@ ...@@ -167,7 +159,6 @@
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals"> <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals">
<!--@mbg.generated-->
update ag_mkt_leads_goals update ag_mkt_leads_goals
<set> <set>
<if test="goalsType != null"> <if test="goalsType != null">
...@@ -225,7 +216,6 @@ ...@@ -225,7 +216,6 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals"> <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.marketing.MktLeadsGoals">
<!--@mbg.generated-->
update ag_mkt_leads_goals update ag_mkt_leads_goals
set goals_type = #{goalsType,jdbcType=INTEGER}, set goals_type = #{goalsType,jdbcType=INTEGER},
practitioner_id = #{practitionerId,jdbcType=BIGINT}, practitioner_id = #{practitionerId,jdbcType=BIGINT},
...@@ -327,4 +317,13 @@ ...@@ -327,4 +317,13 @@
and current_year = #{year,jdbcType=INTEGER} and current_year = #{year,jdbcType=INTEGER}
and goals_type = 1 and goals_type = 1
</select> </select>
<select id="findByTypeAndTimeUnitAndSubordinateSystemId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ag_mkt_leads_goals
where goals_type = #{goalsType,jdbcType=INTEGER}
and statistic_time_unit = #{statisticTimeUnit,jdbcType=INTEGER}
and subordinate_system_id = #{subordinateSystemId,jdbcType=BIGINT}
and is_active = 1
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment