下钻接口修改类型筛选

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -351,7 +351,7 @@
           <if test="dto.endDate != null and dto.endDate != ''">
           and date_le(CAST(a.accept_date as date),#{dto.endDate})
           </if>
-        <if test='businessType !=null and businessType !="" and businessType !="0"'>
+        <if test="businessType !=null and businessType !=''">
             and a.inspection_type = #{businessType}
         </if>
     </select>
@@ -371,7 +371,7 @@
         <if test="dto.endDate != null and dto.endDate != ''">
           and date_le(CAST(a.application_date as date),#{dto.endDate})
         </if>
-        <if test='businessType !=null and businessType !="" and businessType !="0"'>
+        <if test="businessType !=null and businessType !=''">
             and a.inspection_type = #{businessType}
         </if>
     </select>
@@ -397,7 +397,7 @@
         <if test="dto.superviseUnitName != null and dto.superviseUnitName != ''">
             and inspection_unit_name like CONCAT('%', #{dto.superviseUnitName}, '%')
         </if>
-        <if test='businessType !=null and businessType !="" and businessType != "0"'>
+        <if test="businessType !=null and businessType !=''">
             and a.inspection_type = #{businessType}
         </if>
     </select>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java

@@ -946,6 +946,11 @@ public class JYJCDPStatisticsServiceImpl {
         if (orgCode == null) {
             return 0L;
         }
+        if(null != businessType){
+            if("0".equals(businessType)){
+                return inspectionApplicationMapper.countBizFinishedNumForDP(orgCode, dpFilterParamDto,null);
+            }
+        }
         return inspectionApplicationMapper.countBizFinishedNumForDP(orgCode, dpFilterParamDto,businessType);
     }
 
@@ -954,6 +959,11 @@ public class JYJCDPStatisticsServiceImpl {
         if (orgCode == null) {
             return 0L;
         }
+        if(null != businessType){
+            if("0".equals(businessType)){
+                return inspectionApplicationMapper.countBizFinishedNumForDP(orgCode, dpFilterParamDto,null);
+            }
+        }
         return inspectionApplicationMapper.countAllInFlowingForDPNoFinishedBizData(orgCode, dpFilterParamDto,businessType);
     }
 
@@ -967,6 +977,12 @@ public class JYJCDPStatisticsServiceImpl {
             filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
             filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
         }
+        if(null != dpFilterParamForDetailDto.getTreeValue()){
+            if("0".equals(dpFilterParamForDetailDto.getTreeValue())){
+                Page<Map<String, Object>> maps = inspectionApplicationMapper.getInspectDetailList(page, orgCode, filterParamDto, null);
+                return maps;
+            }
+        }
         Page<Map<String, Object>> maps = inspectionApplicationMapper.getInspectDetailList(page, orgCode, filterParamDto, dpFilterParamForDetailDto.getTreeValue());
         return maps;
     }