1.人员代理人 电销添加毛利润

src/main/java/com/ydtech/modules/admin/service/impl/UserReportServiceImpl.java

@@ -230,7 +230,8 @@ public class UserReportServiceImpl implements UserReportService {
             } else if (qxFrontlineAgentVo.getManagementSource().equals("2")) {// 代理人
                 this.agentPerson(getQxFrontlineAgentList, qxFrontlineAgentVo);
             } else if (qxFrontlineAgentVo.getManagementSource().equals("3")) { //电销
-                this.electricPerson(getQxFrontlineAgentList,qxFrontlineAgentVo);
+                getQxFrontlineAgentList .clear();
+                getQxFrontlineAgentList.addAll(userReportMapper.selectChannelPersonOld(qxFrontlineAgentVo));
             }
 
             if (StringUtils.isNotEmpty(qxFrontlineAgentVo.getOutThere())) {
@@ -275,11 +276,18 @@ public class UserReportServiceImpl implements UserReportService {
                         }
                     }
                 }
+                if (qxFrontlineAgentVo.getManagementSource().equals("2")) {
+                    qxFrontlineAgentVo.setUserId(dto.getUserId());
+                    //预期净利润
+                    BigDecimal ExpectNetProfit = insAreaCompanyService.getExpectNetProfit(qxFrontlineAgentVo);
+                    dto.setEstimatedProfit(ExpectNetProfit);
+                }
             }
             resultPage.setContent(qxFrontlineAgentDtos);
             resultPage.setPageNum(qxFrontlineAgentVo.getPageNum());
             resultPage.setPageSize(qxFrontlineAgentVo.getPageSize());
             resultPage.setTotalPages(qxFrontlineAgentDtos.size());
+
             return HttpResult.ok(resultPage);
         } catch (Exception e) {
             e.printStackTrace();
@@ -357,6 +365,9 @@ public class UserReportServiceImpl implements UserReportService {
             getQxFrontlineAgentList.addAll(userReportMapper.selectChannelPersonOld(qxFrontlineAgentVo));
         } else if (qxFrontlineAgentVo.getManagementSource().equals("2")) {// 代理人
             this.agentPerson(getQxFrontlineAgentList, qxFrontlineAgentVo);
+        }else if (qxFrontlineAgentVo.getManagementSource().equals("3")) { //电销
+            getQxFrontlineAgentList .clear();
+            getQxFrontlineAgentList.addAll(userReportMapper.selectChannelPersonOld(qxFrontlineAgentVo));
         }
         if (StringUtils.isNotEmpty(qxFrontlineAgentVo.getOutThere())) {
             if ("1".equals(qxFrontlineAgentVo.getOutThere())) {
@@ -398,8 +409,12 @@ public class UserReportServiceImpl implements UserReportService {
             }
             qxFrontlineAgentVo.setUserId(dto.getUserId());
 //            //预期净利润
-//            BigDecimal ExpectNetProfit = insAreaCompanyService.getExpectNetProfit(qxFrontlineAgentVo);
-//            dto.setEstimatedProfit(ExpectNetProfit);
+            if (qxFrontlineAgentVo.getManagementSource().equals("2")) {
+                qxFrontlineAgentVo.setUserId(dto.getUserId());
+                //预期净利润
+                BigDecimal ExpectNetProfit = insAreaCompanyService.getExpectNetProfit(qxFrontlineAgentVo);
+                dto.setEstimatedProfit(ExpectNetProfit);
+            }
 
             QxFrontlineAgentExcel qxFrontlineAgentExcel = new QxFrontlineAgentExcel();
             BeanUtils.copyProperties(dto,qxFrontlineAgentExcel);

src/main/resources/mapper/modules/console/userReportMapper.xml

@@ -154,12 +154,25 @@
         </where>
         group by sd.id) as f on f.userid = u.id
         <where>
-            d.management_source = '1'
-            and r.role_id = 21
+
             and u.status = '1'
             <if test="vo.provinceId != null and vo.provinceId != ''">
                 and d.id like concat('%',#{vo.provinceId},'%')
             </if>
+            <if test="vo.managementSource  != null  and  vo.managementSource!=''">
+                AND  d.management_source  =#{vo.managementSource}
+            </if>
+
+            <if test="vo.managementSource  !=null  and   vo.managementSource  !=''">
+                <choose>
+                    <when test="vo.managementSource == '1'">
+                       and  r.role_id = 21  and   d.management_source  =#{vo.managementSource}
+                    </when>
+                    <when test="vo.managementSource == '3'">
+                        and (  r.role_id = 3 or r.role_id = 72  )  and   d.management_source  =#{vo.managementSource}
+                    </when>
+                </choose>
+            </if>
             <if test="vo.cityId != null and vo.cityId != ''">
                 and d.id like concat('%',#{vo.cityId},'%')
             </if>