App端增加行社检查情况表,网点自查情况表,修改查询接口为post请求

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/controller/ResumptionReportController.java

@@ -60,7 +60,7 @@ public class ResumptionReportController {
         resumptionReportService.export(request, response);
     }
 
-    @ApiOperation(value = "每日安全保卫履职-日报表")
+    @ApiOperation(value = "每日安全保卫履职-日报表",notes = "web端与App共用此接口")
     @RequiresPermissions("core:resumptionReport:list")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody ResumptionDTO resumptionDTO) throws ExecutionException, InterruptedException, TimeoutException {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/controller/SafetyInspectReportController.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.reportForms.safetyInspect.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -38,10 +39,10 @@ public class SafetyInspectReportController {
     @Resource
     private RemoteOrgService remoteOrgService;
 
-    @ApiOperation(value = "行社全面检查情况表")
+    @ApiOperation(value = "行社全面检查情况表",notes = "web端与App共用此接口")
     @RequiresPermissions("core:safetyInspectReport:list")
-    @GetMapping("/list")
-    public AjaxResult list(SafetyInspectDTO safetyInspectDTO) {
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody SafetyInspectDTO safetyInspectDTO) {
         if (null == safetyInspectDTO.getYear()) {
             LocalDate localDate = LocalDate.now();
             safetyInspectDTO.setYear(String.valueOf(localDate.getYear()));
@@ -58,15 +59,15 @@ public class SafetyInspectReportController {
         return ajax;
     }
 
-    @ApiOperation(value = "网点负责人自查情况表")
+    @ApiOperation(value = "网点负责人自查情况表",notes = "web端与App共用此接口")
     @RequiresPermissions("core:safetyInspectReport:list")
-    @GetMapping("/selfInspectList")
-    public AjaxResult selfInspectList(SafetyInspectDTO safetyInspectDTO) {
+    @PostMapping("/selfInspectList")
+    public AjaxResult selfInspectList(@RequestBody SafetyInspectDTO safetyInspectDTO) {
         AjaxResult ajax = AjaxResult.success();
         String title;
-        if (safetyInspectDTO.getCycle() == 1){
-            safetyInspectDTO.setStartTime(DateUtil.beginOfMonth(DateUtils.parseDate(safetyInspectDTO.getDate().get(0))));
-            safetyInspectDTO.setEndTime(DateUtil.endOfMonth(DateUtils.parseDate(safetyInspectDTO.getDate().get(1))));
+        if (ObjectUtil.equal(1,safetyInspectDTO.getCycle())){
+            safetyInspectDTO.setStartTime(DateUtil.beginOfMonth(DateUtil.parse(safetyInspectDTO.getDate().get(0))));
+            safetyInspectDTO.setEndTime(DateUtil.endOfMonth(DateUtil.parse(safetyInspectDTO.getDate().get(1))));
             String startStr = DateUtils.parseDateToStr("yyyy-MM",safetyInspectDTO.getStartTime());
             String endStr = DateUtils.parseDateToStr("yyyy-MM",safetyInspectDTO.getEndTime());
             title = "网点负责人自查情况表(" + startStr + "至"+endStr+")";

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/dto/SafetyInspectDTO.java

@@ -1,10 +1,9 @@
 package com.xunmei.core.reportForms.safetyInspect.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xunmei.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.Year;
 import java.util.Date;
 import java.util.List;
 
@@ -20,6 +19,9 @@ public class SafetyInspectDTO extends BaseEntity {
     private String orgPath;
     private Integer orgType;
 
+    @ApiModelProperty(value = "值为1是表示来自App的接口查询,使用startTime和endTime字段进行月份范围查询")
+    private Integer appSelect;
+
     //查询月份范围
     private List<String> date;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/mapper/SafetyInspectMapper.java

@@ -1,8 +1,6 @@
 package com.xunmei.core.reportForms.safetyInspect.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
-import com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO;
 import com.xunmei.core.reportForms.safetyInspect.dto.SafetyInspectDTO;
 import com.xunmei.core.reportForms.safetyInspect.vo.SafetyInspectVO;
 import com.xunmei.system.api.domain.SysOrg;
@@ -18,9 +16,9 @@ import java.util.Map;
  */
 @Mapper
 public interface SafetyInspectMapper {
-    SafetyInspectVO selectAllByPath(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType);
+    SafetyInspectVO selectAllByPath(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("req") SafetyInspectDTO req);
 
-    SafetyInspectVO selectSelfByPath(@Param("orgId")Long orgId,@Param("cycle") Integer cycle, @Param("orgPath") String orgPath, @Param("dto") SafetyInspectDTO safetyInspectDTO, @Param("orgType") Integer orgType);
+    SafetyInspectVO selectSelfByPath(@Param("orgId")Long orgId, @Param("orgPath") String orgPath, @Param("dto") SafetyInspectDTO safetyInspectDTO);
 
     Page<SafetyInspectVO> report(@Param("page") Page<SafetyInspectVO> page, @Param("safetyInspectDTO") SafetyInspectDTO safetyInspectDTO);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.reportForms.safetyInspect.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -39,15 +40,20 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
     private MonitorAccessReportMapper monitorAccessReportMapper;
     @Autowired
     private RemoteOrgService orgService;
+
     @Override
     public List<SafetyInspectVO> report(SafetyInspectDTO safetyInspectDTO) {
         if (null == safetyInspectDTO.getOrgId()) {
             safetyInspectDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
+        if (ObjectUtil.equal(1, safetyInspectDTO.getAppSelect())) {
+            safetyInspectDTO.setStartTime(DateUtil.beginOfMonth(safetyInspectDTO.getStartTime()));
+            safetyInspectDTO.setEndTime(DateUtil.endOfMonth(safetyInspectDTO.getEndTime()));
+        }
         //判断机构类型,如果机构类型大于行社，都展示行社数据
         SysOrg sysOrg = orgService.selectSysOrgById(safetyInspectDTO.getOrgId(), SecurityConstants.INNER);
         List<SysOrg> sysOrgs;
-        if(null==sysOrg.getType()){
+        if (null == sysOrg.getType()) {
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
@@ -57,33 +63,38 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         } else {
             return Collections.emptyList();
         }
-        List<SafetyInspectVO>safetyInspectVOList=new ArrayList<>();
-        sysOrgs.forEach(s->{
-            SafetyInspectVO safetyInspectVO=new SafetyInspectVO();
+        List<SafetyInspectVO> safetyInspectVOList = new ArrayList<>();
+        sysOrgs.forEach(s -> {
+            SafetyInspectVO safetyInspectVO = new SafetyInspectVO();
             SysOrg sysOrg1;
             if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
                 sysOrg1 = orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER);
             } else {
                 sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
-                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                if (!sysOrg1.getShortName().contains("地区行社")) {
                     sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
-            safetyInspectVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
+            safetyInspectVO.setCity(!sysOrg1.getShortName().contains("地区行社") ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             safetyInspectVO.setOrgName(s.getShortName());
-            //次数
-            SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectAllByPath(null,s.getPath(),safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
-            //机构维度
-            Integer planInspectOrg = safetyInspectMapper.orgDimensionPlanInspectOrg(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
-            Integer realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
-            Map map1 = safetyInspectMapper.pitfallDimension(null,s.getPath(), safetyInspectDTO, safetyInspectDTO.getOrgType(),4);
-            if (s.getType() == 4) {
-                safetyInspectVOS=safetyInspectMapper.selectAllByPath(s.getId(),null,safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
-                planInspectOrg=safetyInspectMapper.orgDimensionPlanInspectOrg(s.getId(),s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
-                 realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(s.getId(),s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
-                map1 = safetyInspectMapper.pitfallDimension(s.getId(),null, safetyInspectDTO, safetyInspectDTO.getOrgType(),4);
+            SafetyInspectVO safetyInspectVOS;
+            Integer planInspectOrg;
+            Integer realityInspectOrg;
+            Map map1;
+            if (!Objects.equals(s.getType(), OrgTypeEnum.YINGYE_WANGDIAN.getCode())) {
+                //次数
+                safetyInspectVOS = safetyInspectMapper.selectAllByPath(null, s.getPath(), safetyInspectDTO);
+                //机构维度
+                planInspectOrg = safetyInspectMapper.orgDimensionPlanInspectOrg(null, s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+                realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(null, s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+                map1 = safetyInspectMapper.pitfallDimension(null, s.getPath(), safetyInspectDTO, safetyInspectDTO.getOrgType(), 4);
+            } else {
+                safetyInspectVOS = safetyInspectMapper.selectAllByPath(s.getId(), null, safetyInspectDTO);
+                planInspectOrg = safetyInspectMapper.orgDimensionPlanInspectOrg(s.getId(), s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+                realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(s.getId(), s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+                map1 = safetyInspectMapper.pitfallDimension(s.getId(), null, safetyInspectDTO, safetyInspectDTO.getOrgType(), 4);
             }
-            Double i = 0d;
+            double i = 0d;
             if (planInspectOrg != 0 && realityInspectOrg != 0) {
                 i = (double) realityInspectOrg / planInspectOrg * 100;
             }
@@ -107,11 +118,16 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         if (null == safetyInspectDTO.getOrgId()) {
             safetyInspectDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
+
+        if (ObjectUtil.equal(1, safetyInspectDTO.getAppSelect())) {
+            safetyInspectDTO.setStartTime(DateUtil.beginOfMonth(safetyInspectDTO.getStartTime()));
+            safetyInspectDTO.setEndTime(DateUtil.endOfMonth(safetyInspectDTO.getEndTime()));
+        }
         //判断机构类型,如果机构类型大于行社，都展示行社数据
         SysOrg sysOrg = orgService.selectSysOrgById(safetyInspectDTO.getOrgId(), SecurityConstants.INNER);
         List<SysOrg> sysOrgs;
-        if (null==sysOrg.getType()){
-            return  Collections.EMPTY_LIST;
+        if (null == sysOrg.getType()) {
+            return Collections.EMPTY_LIST;
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
@@ -120,32 +136,36 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         } else {
             return Collections.emptyList();
         }
-        List<SelfInspectVO>safetyInspectVOList=new ArrayList<>();
-        sysOrgs.forEach(s->{
-            SelfInspectVO safetyInspectVO=new SelfInspectVO();
+        List<SelfInspectVO> safetyInspectVOList = new ArrayList<>();
+        sysOrgs.forEach(s -> {
+            SelfInspectVO safetyInspectVO = new SelfInspectVO();
             SysOrg sysOrg1;
             if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
                 sysOrg1 = orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER);
             } else {
                 sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
-                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                if (!sysOrg1.getShortName().contains("地区行社")) {
                     sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
+            SafetyInspectVO safetyInspectVOS;
+            Map map1;
+            Map map;
             Integer integer = monitorAccessReportMapper.selectOrgNumByPathAndType(s.getPath(), OrgTypeEnum.YINGYE_WANGDIAN.getCode());
-            //次数
-            SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectSelfByPath(null,safetyInspectDTO.getCycle(),s.getPath(),safetyInspectDTO,safetyInspectDTO.getOrgType());
-            Map map1 = safetyInspectMapper.pitfallDimension(null,s.getPath(), safetyInspectDTO, safetyInspectDTO.getOrgType(),3);
-            //机构维度
-            Map map = safetyInspectMapper.orgDimension(null,s.getPath(), safetyInspectDTO, safetyInspectDTO.getOrgType(),3);
-            if (s.getType()==4){
-                integer=1;
-                safetyInspectVOS=safetyInspectMapper.selectSelfByPath(s.getId(),safetyInspectDTO.getCycle(),null,safetyInspectDTO,safetyInspectDTO.getOrgType());
-                map1= safetyInspectMapper.pitfallDimension(s.getId(),null, safetyInspectDTO, safetyInspectDTO.getOrgType(),3);
-                map=safetyInspectMapper.orgDimension(s.getId(),null, safetyInspectDTO, safetyInspectDTO.getOrgType(),3);
+            if (s.getType() != 4) {
+                //次数
+                safetyInspectVOS = safetyInspectMapper.selectSelfByPath(null, s.getPath(), safetyInspectDTO);
+                map1 = safetyInspectMapper.pitfallDimension(null, s.getPath(), safetyInspectDTO, safetyInspectDTO.getOrgType(), 3);
+                //机构维度
+                map = safetyInspectMapper.orgDimension(null, s.getPath(), safetyInspectDTO, safetyInspectDTO.getOrgType(), 3);
+            } else {
+                integer = 1;
+                safetyInspectVOS = safetyInspectMapper.selectSelfByPath(s.getId(), null, safetyInspectDTO);
+                map1 = safetyInspectMapper.pitfallDimension(s.getId(), null, safetyInspectDTO, safetyInspectDTO.getOrgType(), 3);
+                map = safetyInspectMapper.orgDimension(s.getId(), null, safetyInspectDTO, safetyInspectDTO.getOrgType(), 3);
             }
             safetyInspectVO.setPlanInspectOrg(integer);
-            safetyInspectVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
+            safetyInspectVO.setCity(!sysOrg1.getShortName().contains("地区行社") ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             safetyInspectVO.setOrgName(s.getShortName());
             safetyInspectVO.setRealityInspectOrg(Integer.valueOf(map.get("realityInspectOrg").toString()));
             safetyInspectVO.setInspectCoverRate(map.get("inspectCoverRate").toString());
@@ -172,7 +192,7 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             sysOrg = remoteOrgService.selectSysOrgById(safetyInspectDTO.getOrgId(), SecurityConstants.INNER);
         }
         orgName = sysOrg.getName();
-        List<SafetyInspectVO> safetyInspectVOS =  this.report(safetyInspectDTO);
+        List<SafetyInspectVO> safetyInspectVOS = this.report(safetyInspectDTO);
         if (ObjectUtil.isEmpty(safetyInspectVOS)) {
             throw new RuntimeException("导出数据为空!");
         }
@@ -184,11 +204,11 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
         }
 
-        String baseHeaderName="行社全面检查情况表";
-        String header=baseHeaderName+"(" + safetyInspectDTO.getYear() + ")";
+        String baseHeaderName = "行社全面检查情况表";
+        String header = baseHeaderName + "(" + safetyInspectDTO.getYear() + ")";
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("【" + orgName + "】-"+baseHeaderName + DateHelper.getDateString(new Date()), "UTF-8");
+        String fileName = URLEncoder.encode("【" + orgName + "】-" + baseHeaderName + DateHelper.getDateString(new Date()), "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         // 调用EasyExcel的导出方法
         EasyExcel.write(response.getOutputStream(), SafetyInspectVO.class)
@@ -208,7 +228,7 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             sysOrg = remoteOrgService.selectSysOrgById(safetyInspectDTO.getOrgId(), SecurityConstants.INNER);
         }
         orgName = sysOrg.getName();
-        List<SelfInspectVO> safetyInspectVOS =  this.selfInspectReport(safetyInspectDTO);
+        List<SelfInspectVO> safetyInspectVOS = this.selfInspectReport(safetyInspectDTO);
         if (ObjectUtil.isEmpty(safetyInspectVOS)) {
             throw new RuntimeException("导出数据为空!");
         }
@@ -219,19 +239,19 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         if (safetyInspectVOS.size() > 10000) {
             throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
         }
-        String baseHeaderName="网点负责人自查情况表";
+        String baseHeaderName = "网点负责人自查情况表";
         String header;
-        if (safetyInspectDTO.getCycle() == 1){
-            String startStr = DateUtils.parseDateToStr("yyyy-MM",safetyInspectDTO.getStartTime());
-            String endStr = DateUtils.parseDateToStr("yyyy-MM",safetyInspectDTO.getEndTime());
-            header=baseHeaderName+"(" + startStr + "至"+endStr+")";
-        }else {
-            header=baseHeaderName+"(" + safetyInspectDTO.getYear() + ")";
+        if (safetyInspectDTO.getCycle() == 1) {
+            String startStr = DateUtils.parseDateToStr("yyyy-MM", safetyInspectDTO.getStartTime());
+            String endStr = DateUtils.parseDateToStr("yyyy-MM", safetyInspectDTO.getEndTime());
+            header = baseHeaderName + "(" + startStr + "至" + endStr + ")";
+        } else {
+            header = baseHeaderName + "(" + safetyInspectDTO.getYear() + ")";
         }
 
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("【" + orgName + "】-"+baseHeaderName + DateHelper.getDateString(new Date()), "UTF-8");
+        String fileName = URLEncoder.encode("【" + orgName + "】-" + baseHeaderName + DateHelper.getDateString(new Date()), "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         // 调用EasyExcel的导出方法
         EasyExcel.write(response.getOutputStream(), SelfInspectVO.class)

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -93,7 +93,7 @@
         LEFT JOIN sys_org b ON a.org_id = b.id
         LEFT JOIN core_safecheck_plan c ON a.plan_id = c.id
         WHERE
-        a.deleted = 0
+        a.deleted = 0 and b.deleted=0
         AND c.check_type =4
           <if test="orgId !=null">
               and a.org_id=#{orgId}
@@ -101,11 +101,18 @@
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
-        <if test="year !=null and year !=''">
-            AND a.ymd_year = #{year}
-        </if>
-        <if test="orgType !=null">
-            AND b.type = #{orgType}
+        <choose>
+            <when test="req.appSelect==1">
+                and a.plan_end_time between #{req.startTime} and #{req.endTime}
+            </when>
+            <otherwise>
+                <if test="req.year !=null and req.year !=''">
+                    AND a.ymd_year = #{req.year}
+                </if>
+            </otherwise>
+        </choose>
+        <if test="req.orgType !=null">
+            AND b.type = #{req.orgType}
         </if>
     </select>
     <select id="orgDimension" resultType="java.util.Map">
@@ -195,7 +202,7 @@
     <select id="selectSelfByPath" resultType="com.xunmei.core.reportForms.safetyInspect.vo.SafetyInspectVO">
         SELECT
         IFNULL( COUNT( a.id ), 0 ) AS planInspectNumber,
-        IFNULL(       SUM(
+        IFNULL( SUM(
         IF
         ( a.`status` = 3, 1, 0 )),0) AS realityInspectNumber,
         IFNULL( SUM( a.exception_count ), 0 ) AS pitfallNumber,
@@ -214,27 +221,34 @@
         LEFT JOIN sys_org b ON a.org_id = b.id
         LEFT JOIN core_safecheck_plan c ON a.plan_id = c.id
         WHERE
-        a.deleted = 0
+        a.deleted = 0 and b.deleted=0
         AND c.check_type =3
-          <if test="orgId !=null">
-              and a.org_id =#{orgId}
-          </if>
+        <if test="orgId !=null">
+            and a.org_id =#{orgId}
+        </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
 
-        <if test="dto != null and dto.year !=null and dto.year !=''">
-            AND a.ymd_date like concat(#{dto.year},'%')
-        </if>
-        <if test="dto !=null and dto.startTime != null and dto.endTime != null">
-            AND
-            (
-            #{dto.startTime}   <![CDATA[<=]]> a.ymd_date
-            and #{dto.endTime}     <![CDATA[>=]]> a.ymd_date
-            )
-        </if>
-        <if test="orgType !=null">
-            AND b.type = #{orgType}
+        <choose>
+            <when test="dto.appSelect==1">
+                and a.plan_end_time between #{dto.startTime} and #{dto.endTime}
+            </when>
+            <otherwise>
+                <if test="dto != null and dto.year !=null and dto.year !=''">
+                    AND a.ymd_date like concat(#{dto.year},'%')
+                </if>
+                <if test="dto !=null and dto.startTime != null and dto.endTime != null">
+                    AND
+                    (
+                    #{dto.startTime}   <![CDATA[<=]]> a.ymd_date
+                    and #{dto.endTime}     <![CDATA[>=]]> a.ymd_date
+                    )
+                </if>
+            </otherwise>
+        </choose>
+        <if test="dto.orgType !=null">
+            AND b.type = #{dto.orgType}
         </if>
     </select>
     <select id="orgDimensionPlanInspectOrg" resultType="java.lang.Integer">