wks пре 1 година
родитељ
комит
8961bb8185

+ 7 - 1
src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -225,7 +225,13 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
      */
     List<EmployeeIncreaseReportDto> employeeIncreaseReportDay(HashMap<String,Object> map);
 
-
+    /**
+     * 团队业绩统计
+     * @param userId 用户id
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return
+     */
     List<EsmUserPolicyForUserVO> queryOrderCountForUser(String userId,String startDate, String endDate);
 
     List<EsmUserReferrerDTO> getbyUserNextLevel(String userId);

+ 3 - 1
src/main/java/com/ydtech/modules/esm/model/vo/EsmUserPolicyVO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 @ApiModel("团队管理展示-明细")
@@ -40,4 +39,7 @@ public class EsmUserPolicyVO implements Serializable {
     @ApiModelProperty(value = "手机号")
     private String mobile;
 
+    @ApiModelProperty(value = "平均保费")
+    private double averagePremium;
+
 }

+ 2 - 5
src/main/java/com/ydtech/modules/esm/service/impl/EsmInsCompanyServiceImpl.java

@@ -108,18 +108,15 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         return exist.get();
     }
 
-
     @Override
     public EsmInsCompany getBySubsidiary(String subsidiaryId) {
-        String code = "000000";
-        String substring = subsidiaryId.substring(0, 5);
-        String companyId = substring + code;
+        String companyId = subsidiaryId.replaceAll("[^A-Za-z]", "");
+        AssertionUtils.isFail(StringUtils.isEmpty(companyId), "保险公司不存在");
         EsmInsCompany esmInsCompany = getById(companyId);
         AssertionUtils.isEmpty(esmInsCompany, "保险公司不存在");
         return esmInsCompany;
     }
 
-
     @Override
     public List<String> getByLowerId(String companyId) {
         return baseMapper.getByLowerId(companyId);

+ 8 - 7
src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -12,13 +12,14 @@
 
     <select id="queryOrderCount" resultType="com.ydtech.modules.esm.model.vo.EsmUserPolicyVO">
         select a.id,
-               a.username,
-               a.mobile,
-               a.policynum as ordernum,
-               a.sumpremium as sumpremium,
-               b.policynum as bjpolicynum,
-               b.sumpremium as bjsumpremium,
-               c.policynum as policynum
+        a.username,
+        a.mobile,
+        a.policynum as ordernum,
+        a.sumpremium as sumpremium,
+        b.policynum as bjpolicynum,
+        b.sumpremium as bjsumpremium,
+        c.policynum as policynum,
+        c.policynum / a.policynum as averagePremium
         from (
 
         SELECT