Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanTaskController.java

@@ -493,12 +493,14 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "检查人员") @RequestParam(value = "executorId", required = false) Long executorId,
             @ApiParam(value = "任务类型") @RequestParam(value = "taskType", required = false) String taskType,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
-            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception {
+            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize,
+            @ApiParam(value = "1-排除外部计划 0-或空-正常查询") @RequestParam(value = "outsideType", required = false) Integer outsideType) throws Exception {
         HashMap<String, Object> params = new HashMap<String, Object>();
 //        ReginParams reginParams = getSelectedOrgInfo();
 //        String loginOrgCode = getOrgCode(reginParams);
 //        Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
 //        params.putAll(authMap);
+        params.put("outsideType", outsideType);
         params.put("userId", userId);
         params.put("companyId", companyId);
         params.put("orgCode", loginOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckReportServiceImpl.java

@@ -200,13 +200,16 @@ public class CheckReportServiceImpl extends BaseService<CheckReportDto, CheckRep
                 routePoints.forEach(item -> {
                     CheckReportCompanyDto checkReportCompanyDto = new CheckReportCompanyDto();
                     checkReportCompanyDto.setCheckResult("正常");
-                    checkReportCompanyDto.setId(collect.get(item.getPointId()).getPointNo());
-                    checkReportCompanyDto.setName(collect.get(item.getPointId()).getName());
-                    if (map.containsKey(item.getPointId())) {
-                        checkReportCompanyDto.setCheckResult("存在隐患");
+                    //TODO 外部消防单位报错 -- p_point表数据丢失（后面问唐伟）
+                    if (collect.containsKey(item.getPointId())) {
+                        checkReportCompanyDto.setId(collect.get(item.getPointId()).getPointNo());
+                        checkReportCompanyDto.setName(collect.get(item.getPointId()).getName());
+                        if (map.containsKey(item.getPointId())) {
+                            checkReportCompanyDto.setCheckResult("存在隐患");
+                        }
+                        checkReportCompanyDto.setDeptCount(companyDeptCountMap.get(checkReportCompanyDto.getId()));
+                        companyDtoList.add(checkReportCompanyDto);
                     }
-                    checkReportCompanyDto.setDeptCount(companyDeptCountMap.get(checkReportCompanyDto.getId()));
-                    companyDtoList.add(checkReportCompanyDto);
                 });
                 checkReportDto.setCheckCompanyList(companyDtoList);
             }

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -1095,6 +1095,7 @@ WHERE
 	(
 		discoverer_user_id = #{userId} AND danger_state = 'draft'
 		AND biz_info LIKE concat('%',#{planId},'%')
+        AND deleted = 0
 	)
     </select>
 </mapper>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -210,6 +210,10 @@
         p_plan_task pt
         INNER JOIN p_plan p ON pt.plan_id = p.id
         INNER JOIN p_route r on r.id = pt.route_id
+        <if test="outsideType != null and outsideType == 1 ">
+            where
+            p.checkLevel != 3
+        </if>
         ) a
         <include refid="mobile-plan-task-where"/>
         limit #{offset},#{pageSize}
@@ -273,6 +277,10 @@
         p_plan_task pt
         INNER JOIN p_plan p ON pt.plan_id = p.id
         INNER JOIN p_route r on r.id = pt.route_id
+        <if test="outsideType != null and outsideType == 1 ">
+            where
+            p.checkLevel != 3
+        </if>
         ) a
         <include refid="mobile-plan-task-where"/>
     </select>