1.控制台人员代理人右侧团队排名添加时间过滤条件

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

@@ -476,6 +476,9 @@ public class UserReportServiceImpl implements UserReportService {
             String countyId =   this.removeTrailingZeros(qxFrontlineAgentVo.getCountyId());
             qxFrontlineAgentVo.setCountyId(countyId);
         }
+        HashMap<String, String> map = getDateMapByType(qxFrontlineAgentVo.getDays(), qxFrontlineAgentVo.getCreatetimeStart(), qxFrontlineAgentVo.getCreatetimeEnd());
+        qxFrontlineAgentVo.setCreatetimeStart(map.get("startDate"));
+        qxFrontlineAgentVo.setCreatetimeEnd(map.get("endDate"));
         //按照条件重新查询数据
         List<QxFrontlineAgentDto> list = sysUserMapper.queryQxFrontlineAgentList(qxFrontlineAgentVo);
         List<QxFrontlineAgentDto> listNew =new ArrayList<>();
@@ -508,8 +511,11 @@ public class UserReportServiceImpl implements UserReportService {
                         .collect(Collectors.toList());
                 if(limitList!=null &&  limitList.size()>0){
                     for(QxFrontlineAgentDto  dto : limitList){
+                        List<String> ids = dto.getIds();
+                        qxFrontlineAgentVo.setIds(ids);
+
                         //查询出单人力
-                        Double  sumAmount  = insAreaCompanyService.getOrderPremiumByUserIds(dto.getIds());
+                        Double  sumAmount  = insAreaCompanyService.getOrderPremiumByUserIds(qxFrontlineAgentVo);
                         dto.setTotalPremium(sumAmount.toString());
                         listNew.add(dto);
                     }
@@ -526,7 +532,10 @@ public class UserReportServiceImpl implements UserReportService {
                     userIds.add(dto.getUserId());
                     dto.setIds(userIds);
                     dto.setTotalManpower(userIds.size()+"");
-                    Double  sumAmount  = insAreaCompanyService.getOrderPremiumByUserIds(dto.getIds());
+                    List<String> ids = dto.getIds();
+                    qxFrontlineAgentVo.setIds(ids);
+
+                    Double  sumAmount  = insAreaCompanyService.getOrderPremiumByUserIds(qxFrontlineAgentVo);
                     dto.setTotalPremium(sumAmount.toString());
                     dto.setTotalPremiumNum(sumAmount);
                     listNews.add(dto);

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -10,10 +10,7 @@ import com.ydtech.modules.admin.model.report.opetationData.BusinessDataDto;
 import com.ydtech.modules.admin.model.report.opetationData.BusinessDataQueryDto;
 import com.ydtech.modules.admin.model.report.opetationData.QuotationCountDataDto;
 import com.ydtech.modules.admin.model.report.opetationData.QuotationCountQueryDto;
-import com.ydtech.modules.admin.model.vo.AgencyUserInsAreaVo;
-import com.ydtech.modules.admin.model.vo.OrdersDataVo;
-import com.ydtech.modules.admin.model.vo.SubOrder;
-import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
+import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
@@ -245,7 +242,7 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      *  @Date: 2024/8/30 10:22
      *  @Description:  通过用户id查询金额数据
      */
-    Double  getOrderPremiumByUserIds(@Param("ids") List<String>  ids);
+    Double  getOrderPremiumByUserIds(@Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
     /**
      *  @version
      *  @author: whp

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.QxFrontlineAgentDto;
+import com.ydtech.modules.admin.model.vo.QxFrontlineAgentVo;
 import com.ydtech.modules.fnc.entity.vo.ProblemOrderQueryVo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
@@ -216,7 +217,7 @@ public interface InsAreaCompanyService extends IService<InsAreaCompany> {
      * @Date: 2024/8/30 10:23
      * @Description: 通过用户id查询到导出的数据
      */
-    Double getOrderPremiumByUserIds(List<String> ids);
+    Double getOrderPremiumByUserIds(QxFrontlineAgentVo qxFrontlineAgentVo);
 
 
     /**

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -12,6 +12,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.ManagementSource;
 import com.ydtech.modules.admin.model.dto.QxFrontlineAgentDto;
+import com.ydtech.modules.admin.model.vo.QxFrontlineAgentVo;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
@@ -1034,8 +1035,8 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
      * @Description: 通过用户id查询总保费
      */
     @Override
-    public Double getOrderPremiumByUserIds(List<String> ids) {
-        return baseMapper.getOrderPremiumByUserIds(ids);
+    public Double getOrderPremiumByUserIds(QxFrontlineAgentVo qxFrontlineAgentVo) {
+        return baseMapper.getOrderPremiumByUserIds(qxFrontlineAgentVo);
     }
 
     @Override

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -2477,12 +2477,16 @@
         LEFT JOIN ins_orders io ON io.orderno = iac.orderno
         <where>
             iac.orderstatus = '3'
-            <if test="ids  != null  and  ids.size()>0 ">
+            <if test="vo.ids  != null  and  vo.ids.size()>0 ">
                 AND io.userid IN
-                <foreach item="item"  collection="ids" open="(" separator="," close=")">
+                <foreach item="item"  collection="vo.ids" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
+
+            <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
+                AND iac.signing_time BETWEEN #{vo.createtimeStart} AND #{vo.createtimeEnd}
+            </if>
         </where>
     </select>
     <select id="querOrdersDataPage"  resultType="com.ydtech.modules.admin.model.report.company.OrdersDataDto">