1.业务数据代理人显示调整

src/main/java/com/ydtech/modules/admin/model/vo/BusinessAgentData.java

@@ -50,5 +50,10 @@ public class BusinessAgentData {
     @ApiModelProperty(value = "保险公司图片")
     private String logo;
 
+    @ApiModelProperty(value = "机构来源")
+    private String managementSource;
+
+    @ApiModelProperty(value = "总人数")
+    private String totalNumber;
 
 }

src/main/java/com/ydtech/modules/admin/model/vo/TaskStatisticsVo.java

@@ -115,6 +115,9 @@ public class TaskStatisticsVo implements Serializable {
 
 
 
+    @ApiModelProperty(value = "总人数")
+    private String totalNumber;
+
 
 
 }

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

@@ -367,6 +367,8 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 List<String> userIds=this.getNextLevel(taskStatisticsVo.getTreeUserId());
                 if(!userIds.isEmpty()){
                     taskStatisticsVo.setUserIds(userIds);
+                }else {
+                    taskStatisticsVo.setUserId(taskStatisticsVo.getTreeUserId());
                 }
             }else if ("1".equals(taskStatisticsVo.getTreeType())){
                 taskStatisticsVo.setDeptId(taskStatisticsVo.getTreeUserId());
@@ -536,6 +538,8 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 List<String> userIds=this.getNextLevel(taskStatisticsVo.getTreeUserId());
                 if(!userIds.isEmpty()){
                     taskStatisticsVo.setUserIds(userIds);
+                }else {
+                    taskStatisticsVo.setUserId(taskStatisticsVo.getTreeUserId());
                 }
             }else if ("1".equals(taskStatisticsVo.getTreeType())){
                 taskStatisticsVo.setDeptId(taskStatisticsVo.getTreeUserId());
@@ -544,7 +548,10 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
             }
         }
 
+
         BusinessAgentData result = this.taskStatisticsMapper.getBusinessAgentDataTotalAdd(taskStatisticsVo);
+        Long  total = this.taskStatisticsMapper.getBusinessAgentDataTotal(taskStatisticsVo);
+        result.setTotalNumber(total.toString());
         BusinessAgentData allsumPremium = this.taskStatisticsMapper.getAllsumPremium(taskStatisticsVo);
         if (ObjectUtils.isNotEmpty(allsumPremium) && ObjectUtils.isNotEmpty(result)) {
             BigDecimal sumPremium = allsumPremium.getSumPremium().compareTo(BigDecimal.ZERO) > 0 ? allsumPremium.getSumPremium() : BigDecimal.ZERO;

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -12,7 +12,8 @@
         IFNULL(sum(jqpremium),0) as "jqpremium",
         IFNULL(sum(sypremium),0) as "sypremium",
         IFNULL(sum(taxamount),0) as "taxamount",
-        IFNULL(sum(jypremium),0) as "jypremium"
+        IFNULL(sum(jypremium),0) as "jypremium",
+        sd.management_source as "managementSource"
         from ins_area_company iac
         left join ins_orders io on io.orderno =iac.orderno
         left join sys_user su on io.userid =su.id
@@ -53,7 +54,7 @@
                 and su.name=#{vo.userName}
             </if>
         </where>
-        group by io.userid,su.name
+        group by io.userid,su.name,sd.management_source
     </select>
 
     <select id="getBusinessAgentDataTotal" resultType="java.lang.Long">