1.控制台时间条件筛选近一天

2.控制台任务渠道添加领导人筛选

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

@@ -68,6 +68,9 @@ public class QxFrontlineAgentVo implements Serializable {
     @ApiModelProperty(value = "结束时间")
     private String createtimeStart;
 
+    @ApiModelProperty(value = "领导人id")
+    private String leaderId;
+
     @ApiModelProperty(value = "类型  1 近1天 2近7天 3.近30天")
     private String days;
 

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

@@ -103,4 +103,5 @@ public class TaskStatisticsVo implements Serializable {
 
 
 
+
 }

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

@@ -49,7 +49,9 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
      */
     @Override
     public List<ProfitAnalysisDto> getProfitAnalysisQueryList(ProfitAnalysisQueryDto profitAnalysisQueryDto) {
-
+        HashMap<String, String> dateMapByType = getDateMapByType(profitAnalysisQueryDto.getDateType(), profitAnalysisQueryDto.getYear());
+        profitAnalysisQueryDto.setBeginDate(dateMapByType.get("startDate"));
+        profitAnalysisQueryDto.setEndDate(dateMapByType.get("endDate"));
         return insPlyIncomeMapper.getProfitAnalysisQueryList(profitAnalysisQueryDto);
     }
 

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

@@ -128,6 +128,20 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
      **/
     @Override
     public IPage<TaskStatisticsDto> insuranceCompanyQueryPage(TaskStatisticsVo taskStatisticsVo) {
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getProvinceId())){
+            String provinceId =   this.removeTrailingZeros(taskStatisticsVo.getProvinceId());
+            taskStatisticsVo.setProvinceId(provinceId);
+
+        }
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getCityId())){
+            String cityId =   this.removeTrailingZeros(taskStatisticsVo.getCityId());
+            taskStatisticsVo.setCityId(cityId);
+        }
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getCountyId())){
+            String countyId =   this.removeTrailingZeros(taskStatisticsVo.getCountyId());
+            taskStatisticsVo.setCountyId(countyId);
+        }
+
         PageVo<TaskStatisticsVo> pageVo = new PageVo<>();
         Page page = new Page(taskStatisticsVo.getPageNum(), taskStatisticsVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
@@ -138,6 +152,26 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         list.setTotal(total);
         return list;
     }
+
+
+    private String removeTrailingZeros(String value) {
+        int len = value.length();
+        int i = len - 1;
+
+        // 查找第一个非零字符的位置
+        while (i >= 0 && value.charAt(i) == '0') {
+            i--;
+        }
+
+        // 如果所有字符都是0，则返回"0"
+        if (i < 0) {
+            return "0";
+        }
+
+        // 使用substring方法获取去除末尾零的子串
+        return value.substring(0, i + 1);
+    }
+
     /**
      * @description:   代理人统计查询
      * @author: whp
@@ -230,11 +264,20 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
      **/
     @Override
     public IPage<TaskStatisticsDto> getBusinessData(TaskStatisticsVo taskStatisticsVo) {
+        if(StringUtils.isNotEmpty(taskStatisticsVo.getDays())){
+            if("7".equals(taskStatisticsVo.getDays())){
+                taskStatisticsVo.setDateType("2");
+            } else if ("30".equals(taskStatisticsVo.getDays())) {
+                taskStatisticsVo.setDateType("3");
+            }
+        }
+        HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
+        taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
+        taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
         PageVo<TaskStatisticsVo> pageVo = new PageVo<>();
         Page page = new Page(taskStatisticsVo.getPageNum(), taskStatisticsVo.getPageSize());
         pageVo.setPageNum(taskStatisticsVo.getPageNum());
         pageVo.setPageSize(taskStatisticsVo.getPageSize());
-
         IPage<TaskStatisticsDto> list = this.insAreaCompanyMapper.getBusinessData(page,taskStatisticsVo);
         return list;
     }

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

@@ -1382,6 +1382,10 @@
             <if test="vo.phoneNumber != null and vo.phoneNumber != ''">
                 and su.mobile   =#{vo.phoneNumber}
             </if>
+
+            <if test="vo.leaderId != null and vo.leaderId != ''">
+                and su.leader_id   =#{vo.leaderId}
+            </if>
         </where>
     </select>
 

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -2876,6 +2876,9 @@
                     <if test="vo.year !=null  and  vo.year !=''">
                        and DATE_FORMAT( iac.signing_time, '%Y') =#{vo.year}
                     </if>
+                    <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
+                        AND  iac.signing_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                    </if>
                     <if test="vo.days !=null  and vo.days !='' ">
                         and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
                     </if>

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

@@ -1610,9 +1610,6 @@
         <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
             AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
         </if>
-        <if test="vo.days !=null  and vo.days !=''  and vo.days != 0 ">
-            and iac.createtime >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
-        </if>
         <if test="vo.provinceId != null and vo.provinceId != '' and  vo.cityId == null and vo.countyId == null  and vo.houseId == null ">
             and io.deptid like "${vo.provinceId}%"
         </if>