Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -113,8 +113,8 @@ public class FirefightersController extends BaseController {
 
     @Value("${auth-key-fire-fighters:fire_fighters_info}")
     private String authKey;
-    @Value("${system.type}")
-    private String type;
+    @Value("${logic}")
+    private Boolean logic;
     @Autowired
     IUserCarService userCarService;
 
@@ -428,7 +428,7 @@ public class FirefightersController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "所有的消防人员", notes = "所有的消防人员")
     public ResponseModel<Object> getAllFirefightersPerson(String jobCode)throws Exception {
         String bizOrgCode = null;
-        if("dl".equals(type)){
+        if(!logic){
             // 获取登陆人角色firefighters/all/fire/person
             ReginParams reginParams = getSelectedOrgInfo();
             bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();

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

@@ -7711,24 +7711,9 @@ ORDER BY
 
 -- 运维概览-韶山消防巡查统计
 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 `p_plan_task`.`check_date` LIKE concat( curdate(), '%' ) ) AS `point_num`,
-    (
-        SELECT
-            ifnull( sum( `p_plan_task`.`point_num` ), 0 )
-        FROM
-            `p_plan_task`
-        WHERE
-                `p_plan_task`.`finish_status` = 3
-          AND `p_plan_task`.`check_date` LIKE concat( curdate(), '%' )
-    ) AS `miss_num`,
-    (
-        SELECT
-            ifnull( sum( `p_plan_task`.`point_num` ), 0 )
-        FROM
-            `p_plan_task`
-        WHERE
-                `p_plan_task`.`finish_status` = 0
-          AND `p_plan_task`.`check_date` LIKE concat( curdate(), '%' )
-    ) AS `unfinish_num`;
+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 (`p_plan_task`.`check_date` like concat(curdate(),'%'))) AS `point_num`,(select ifnull(sum(`p_plan_task`.`point_num`),0) from `p_plan_task` where ((`p_plan_task`.`finish_status` = 3) and (`p_plan_task`.`check_date` like concat(curdate(),'%')))) AS `miss_num`,(select ifnull(sum(`p_plan_task`.`point_num`),0) from `p_plan_task` where ((`p_plan_task`.`finish_status` <> 2) and (`p_plan_task`.`check_date` like concat(curdate(),'%')))) AS `unfinish_num`;
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/application.properties

@@ -138,7 +138,7 @@ management.security.enabled=true
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 #?????????
-system.type=dl
+#system.type=dl
 
 ##代码中有部分逻辑冲突需要处理  为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
 logic=false