修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -83,7 +83,7 @@ public class ControllerAop {
         // 不需要添加请求头的接口
         String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage"};
+                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/excel/export/QDSJ"};
         // 获取请求路径
         for (String uri : url) {
             if (request.getRequestURI().indexOf(uri) != -1) {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -164,7 +164,6 @@
                 <foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach>
             </if>
             LIMIT #{map.pageNum}, #{map.pageSize}
-
     </select>
 
     <!--机场单位查询机构下所有子数据 2021-09-16 by litw  -->

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -651,7 +651,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		if(!positionType.equals("")) {
 			String positionTypeFine = positionType;
-			list = list.stream().filter(e-> !ValidationUtil.isEmpty(e.get("positionType")) &&  e.get("positionType").toString().contains(positionTypeFine)).collect(Collectors.toList());
+			list = list.stream().filter(e-> String.valueOf(e.get("positionType")).equals(positionTypeFine)).collect(Collectors.toList());
 		}
 		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
 		pageBean.setRecords(list);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -875,11 +875,11 @@ public class TopographyController extends AbstractBaseController {
 
         String prefix = null;
         String suffix = null;
-        if (iotCode.length() > 8) {
+        if (StringUtil.isNotEmpty(iotCode) && iotCode.length() > 8) {
             prefix = iotCode.substring(0, 8);
             suffix = iotCode.substring(8);
         } else {
-            return CommonResponseUtil.failure("装备物联编码错误，请确认！");
+            return CommonResponseUtil.failure("装备物联编码不存在或编码错误，请确认！");
         }
         ResponseModel entity = null;
         try {
@@ -1031,11 +1031,11 @@ public class TopographyController extends AbstractBaseController {
 
         String prefix = null;
         String suffix = null;
-        if (iotCode.length() > 8) {
+        if (StringUtil.isNotEmpty(iotCode) && iotCode.length() > 8) {
             prefix = iotCode.substring(0, 8);
             suffix = iotCode.substring(8);
         } else {
-            return CommonResponseUtil.failure("装备物联编码错误，请确认！");
+            return CommonResponseUtil.failure("装备物联编码不存在或编码错误，请确认！");
         }
         ResponseModel entity = null;
         String[] filedKeyArr = parmfieldKey.split(",");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -207,8 +207,11 @@ public class ExcelServiceImpl {
 //		if(org.apache.commons.lang3.StringUtils.isBlank(bizOrgCode)){
 //			authFalg=true;
 //		}
-        //效验参数
-		boolean authFlag = getFlag(par);
+		//效验参数
+		boolean authFlag = true;
+		if (!"QDSJ".equals(excelDto.getType())) {
+			authFlag = getFlag(par);
+		}
 
 		switch (excelDto.getType()) {
 

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -7707,4 +7707,35 @@ WHERE
 	0 <> find_in_set( '011023306003010000000013', `sa`.`system_codes` ))
 ORDER BY
 	`sa`.`create_date` DESC
-	LIMIT 60;
+	LIMIT 60;
\ No newline at end of file
+
+-- 运维概览-韶山消防巡查统计
+DROP VIEW IF EXISTS `v_fire_check_num_shaoshan`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_fire_check_num_shaoshan` AS
+SELECT
+	(
+	SELECT
+		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+	FROM
+		`p_plan_task`
+	WHERE
+		( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
+	) AS `point_num`,
+	(
+	SELECT
+		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+	FROM
+		`p_plan_task`
+	WHERE
+		`p_plan_task`.`finish_status` = 3
+		AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
+	) AS `miss_num`,
+	(
+	SELECT
+		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+	FROM
+		`p_plan_task`
+	WHERE
+		( `p_plan_task`.`finish_status` = 0 )
+	AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
+	) AS `unfinish_num`;
\ No newline at end of file