1.控制台 目前保司业务数据只有内部机构筛选，建议增加保险公司所在地区筛选（只选地区），方便查看各地区保费和车船税业务贡献量

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

@@ -453,6 +453,22 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 taskStatisticsVo.setDateType("1");
             }
         }
+
+        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);
+        }
+
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
@@ -480,6 +496,20 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 taskStatisticsVo.setDateType("1");
             }
         }
+        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);
+        }
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));

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

@@ -2351,16 +2351,16 @@
             AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
         </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}%"
+            and io.deptid like concat('%',#{vo.provinceId},'%')
         </if>
         <if test="vo.cityId != null and vo.cityId != '' and vo.countyId ==null and  vo.houseId ==null">
-            and io.deptid like "${vo.cityId}%"
+            and io.deptid like concat('%',#{vo.cityId},'%')
         </if>
         <if test="vo.countyId != null and vo.countyId != '' and  vo.houseId  ==null">
-            and io.deptid like "${vo.countyId}%"
+            and io.deptid like concat('%',#{vo.countyId},'%')
         </if>
         <if test="vo.houseId != null and vo.houseId != ''">
-            and io.deptid like "${vo.houseId}%"
+            and io.deptid like concat('%',#{vo.houseId},'%')
         </if>
         <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
             AND io.deptid  in
@@ -2436,16 +2436,16 @@
             AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
         </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}%"
+            and io.deptid like concat('%',#{vo.provinceId},'%')
         </if>
         <if test="vo.cityId != null and vo.cityId != '' and vo.countyId ==null and  vo.houseId ==null">
-            and io.deptid like "${vo.cityId}%"
+            and io.deptid like concat('%',#{vo.cityId},'%')
         </if>
         <if test="vo.countyId != null and vo.countyId != '' and  vo.houseId  ==null">
-            and io.deptid like "${vo.countyId}%"
+            and io.deptid like concat('%',#{vo.countyId},'%')
         </if>
         <if test="vo.houseId != null and vo.houseId != ''">
-            and io.deptid like "${vo.houseId}%"
+            and io.deptid like concat('%',#{vo.houseId},'%')
         </if>
         <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
             AND io.deptid  in
@@ -2490,16 +2490,16 @@
             AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
         </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}%"
+            and io.deptid like concat('%',#{vo.provinceId},'%')
         </if>
         <if test="vo.cityId != null and vo.cityId != '' and vo.countyId ==null and  vo.houseId ==null">
-            and io.deptid like "${vo.cityId}%"
+            and io.deptid like concat('%',#{vo.cityId},'%')
         </if>
         <if test="vo.countyId != null and vo.countyId != '' and  vo.houseId  ==null">
-            and io.deptid like "${vo.countyId}%"
+            and io.deptid like concat('%',#{vo.countyId},'%')
         </if>
         <if test="vo.houseId != null and vo.houseId != ''">
-            and io.deptid like "${vo.houseId}%"
+            and io.deptid like concat('%',#{vo.houseId},'%')
         </if>
         <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
             AND io.deptid  in