修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -96,6 +96,12 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
             @Param("fieldCodes") Map<String, Object> fieldCodes,
             @Param("groupCode") String groupCode);
 
+    List<Map<String, Object>> getOnDutyPersonList(
+            @Param("dutyDate") String dutyDay,
+            @Param("shiftId") String shiftIds,
+            @Param("fieldCodes") Map<String, Object> fieldCodes,
+            @Param("groupCode") String groupCode);
+
     List<DynamicFormInstance> getInstanceByCodeAndValue(String code, String value);
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCommonService.java

@@ -106,6 +106,8 @@ public interface IDutyCommonService {
      */
     List<Map<String, Object>> listOnDutyPerson();
 
+    List<Map<String, Object>> getOnDutyPersonList();
+
     //120系统迁移接口 sql固定查询急救科下值班人员
     List<Map<String, Object>> listOnDutyPersonByAid();
 

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

@@ -261,6 +261,48 @@
         </if>
         order by instanceId desc
     </select>
+    <select id="getOnDutyPersonList" resultType="java.util.Map">
+        select
+        d.*,
+        ps.shift_id as shiftId,
+        ps.duty_date as dutyDate,
+        ds.name as shiftName,
+        '在岗' state
+        from
+        (
+        select
+        i.INSTANCE_ID instanceId,
+        i.GROUP_CODE groupCode,
+        <foreach collection="fieldCodes" item="value" index="key" separator=",">
+            MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as ${key}
+        </foreach>
+        ,
+        IFNULL(( SELECT c.field_value FROM cb_dynamic_form_instance c, `cb_org_usr` WHERE field_code = 'telephone' AND c.instance_id = `cb_org_usr`.sequence_nbr AND `cb_org_usr`.sequence_nbr = MAX(CASE WHEN i.FIELD_CODE = 'userId' THEN i.FIELD_VALUE END) ), "" ) AS telephone
+        from
+        cb_dynamic_form_instance i
+        where i.GROUP_CODE = #{groupCode}
+        GROUP by
+        i.INSTANCE_ID ) d,
+        cb_duty_person_shift ps,
+        cb_duty_shift ds
+        where
+        d.instanceId = ps.instance_id
+        and d.deptId not in (SELECT
+        `cb_org_usr`.`sequence_nbr`
+        FROM
+        `cb_org_usr`
+        WHERE
+        (
+        ( `cb_org_usr`.`biz_org_code` LIKE concat( ( SELECT `cb_org_usr`.`biz_org_code` FROM `cb_org_usr` WHERE ( `cb_org_usr`.`sequence_nbr` = 1435847345328660481 ) ), '%' ) )
+        AND ( `cb_org_usr`.`biz_org_type` = 'DEPARTMENT' )
+        ))
+        and ps.shift_id = ds.sequence_nbr
+        and ps.duty_date = #{dutyDate}
+        <if test="shiftId != null and shiftId != ''">
+            and ps.shift_id in (#{shiftId})
+        </if>
+        order by instanceId desc
+    </select>
     <select id="getInstanceByCodeAndValue" resultType="com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance">
         SELECT
             f.instance_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyPersonController.java

@@ -261,6 +261,13 @@ public class DutyPersonController extends BaseController {
         return ResponseHelper.buildResponse(iDutyPersonService.listOnDutyPerson());
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("查询当前值班人三维用")
+    @GetMapping("/duty/list")
+    public ResponseModel getOnDutyPersonList() {
+        return ResponseHelper.buildResponse(iDutyPersonService.getOnDutyPersonList());
+    }
+
 
     /**
      *

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

@@ -730,6 +730,23 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		return maps;
 	}
 
+	@Override
+	public List<Map<String, Object>> getOnDutyPersonList() {
+		String groupCode = this.getGroupCode();
+		// 获取当前班次列表
+		DateTime now = new DateTime();
+		List<Long> shiftIdList = getOnDuty(now);
+		String shiftIds = StringUtils.join(shiftIdList.toArray(), ",");
+		String dutyDay = now.toString(YYYY_MM_DD);
+		// 获取当前值班人员
+		List<DynamicFormColumn> columns = dynamicFormColumnService
+				.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
+		Map<String, Object> fieldCodes = Bean.listToMap(columns, FIELDCODE, QUERYSTRATEGY, DynamicFormColumn.class);
+		List<Map<String, Object>> maps = dynamicFormInstanceService.getBaseMapper().getOnDutyPersonList(dutyDay, shiftIds,
+				fieldCodes, groupCode);
+		return maps;
+	}
+
 	private List<Long> getOnDuty(DateTime now) {
 		List<DutyShiftDto> dutyShiftDtos = dutyShiftService.queryForDutyShiftList(false);
 		List<Long> shiftIds = new ArrayList<>();

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

 package com.yeejoin.equipmanage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -270,6 +271,11 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @ApiOperation(value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
         EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(specificId);
+        // 删除detail数据
+        QueryWrapper<EquipmentDetail> detailQueryWrapper = new QueryWrapper<>();
+        detailQueryWrapper.eq("id", equipmentSpecific.getEquipmentDetailId());
+        EquipmentDetail detail = equipmentDetailService.getOne(detailQueryWrapper);
+        equipmentDetailService.removeOneById(detail.getId());
         Boolean result = equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
         // 同步刷新，不在异步，原因速度3秒左右
         this.refreshCount(equipmentSpecific.getBizOrgCode());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmLogServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -96,12 +97,55 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
         String monthDate = date.substring(0, 7);
         //  获取今日告警设备、日环比
         Map<String, Object> alarmEquipDayLink = equipmentSpecificAlarmLogMapper.alarmEquipLink(date, "%Y-%m-%d", null);
+        BigDecimal bigDecimal = BigDecimal.ZERO;
+        BigDecimal nowDaySum = new BigDecimal(String.valueOf(alarmEquipDayLink.get("sumNum")));
+        BigDecimal lastDaySum = new BigDecimal(String.valueOf(alarmEquipDayLink.get("hbSumNum")));
+        if ("0".equals(String.valueOf(alarmEquipDayLink.get("sumNum")))
+                || "0".equals(String.valueOf(alarmEquipDayLink.get("hbSumNum")))
+                || 0 > (Integer.valueOf(String.valueOf(alarmEquipDayLink.get("sumNum"))) - Integer.valueOf(String.valueOf(alarmEquipDayLink.get("hbSumNum"))))) {
+            alarmEquipDayLink.put("hbRate", bigDecimal + "%");
+        } else {
+            BigDecimal rate = nowDaySum.subtract(lastDaySum).divide(lastDaySum, 2, BigDecimal.ROUND_HALF_UP);
+            alarmEquipDayLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
+        }
+
         //  获取今日告警设备、月环比
         Map<String, Object> alarmEquipMonthLink = equipmentSpecificAlarmLogMapper.alarmEquipLink(monthDate, "%Y-%m", null);
+        BigDecimal nowMonthSum = new BigDecimal(String.valueOf(alarmEquipMonthLink.get("sumNum")));
+        BigDecimal lastMonthSum = new BigDecimal(String.valueOf(alarmEquipMonthLink.get("hbSumNum")));
+        if ("0".equals(String.valueOf(alarmEquipMonthLink.get("sumNum")))
+                || "0".equals(String.valueOf(alarmEquipMonthLink.get("hbSumNum")))
+                || 0 > (Integer.valueOf(String.valueOf(alarmEquipMonthLink.get("sumNum"))) - Integer.valueOf(String.valueOf(alarmEquipMonthLink.get("hbSumNum"))))) {
+            alarmEquipMonthLink.put("hbRate", bigDecimal + "%");
+        } else {
+            BigDecimal rate = nowMonthSum.subtract(lastMonthSum).divide(lastMonthSum, 2, BigDecimal.ROUND_HALF_UP);
+            alarmEquipMonthLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
+        }
         //  获取未消除告警设备，日环比
         Map<String, Object> unCleanAlarmEquipDayLink = equipmentSpecificAlarmLogMapper.unCleanAlarmEquipLink(date, "%Y-%m-%d", "unClean");
+        BigDecimal nowUncleanDaySum = new BigDecimal(String.valueOf(unCleanAlarmEquipDayLink.get("sumNum")));
+        BigDecimal lastUncleanDaySum = new BigDecimal(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum")));
+        if ("0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("sumNum")))
+                || "0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum")))
+                || 0 > (Integer.valueOf(String.valueOf(unCleanAlarmEquipDayLink.get("sumNum"))) - Integer.valueOf(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum"))))) {
+            unCleanAlarmEquipDayLink.put("hbRate", bigDecimal + "%");
+        } else {
+            BigDecimal rate = nowUncleanDaySum.subtract(lastUncleanDaySum).divide(lastUncleanDaySum, 2, BigDecimal.ROUND_HALF_UP);
+            unCleanAlarmEquipDayLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
+        }
+
         //  获取未消除告警设备，月环比
         Map<String, Object> unCleanAlarmEquipMonthLink = equipmentSpecificAlarmLogMapper.unCleanAlarmEquipLink(monthDate, "%Y-%m", "unClean");
+        BigDecimal nowUncleanMonthSum = new BigDecimal(String.valueOf(unCleanAlarmEquipMonthLink.get("sumNum")));
+        BigDecimal lastUncleanMonthSum = new BigDecimal(String.valueOf(unCleanAlarmEquipMonthLink.get("hbSumNum")));
+        if ("0".equals(String.valueOf(unCleanAlarmEquipMonthLink.get("sumNum")))
+                || "0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum")))
+                || 0 > (Integer.valueOf(String.valueOf(unCleanAlarmEquipMonthLink.get("sumNum"))) - Integer.valueOf(String.valueOf(unCleanAlarmEquipMonthLink.get("hbSumNum"))))) {
+            unCleanAlarmEquipMonthLink.put("hbRate", bigDecimal + "%");
+        } else {
+            BigDecimal rate = nowUncleanMonthSum.subtract(lastUncleanMonthSum).divide(lastUncleanMonthSum, 2, BigDecimal.ROUND_HALF_UP);
+            unCleanAlarmEquipMonthLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
+        }
         map.put("alarmEquipDayLink", alarmEquipDayLink);
         map.put("alarmEquipMonthLink", alarmEquipMonthLink);
         map.put("unCleanAlarmEquipDayLink", unCleanAlarmEquipDayLink);

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

@@ -7716,4 +7716,4 @@ 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`;
+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 count(1) AS `total_num` from (select `b`.`id` AS `id` from ((`p_plan_task_detail` `b` left join `p_plan_task` `a` on((`a`.`id` = `b`.`task_no`))) left join `p_point` `d` on((`d`.`id` = `b`.`point_id`))) where ((`b`.`is_finish` = 0) and (`a`.`check_date` = curdate())) order by `b`.`id`) `t`) AS `unfinish_num`;

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -185,63 +185,41 @@
     </select>
     <select id="alarmEquipLink" resultType="java.util.Map">
         SELECT
-            ta.`date`,
-            IFNULL( ta.sumNum, 0 ) AS sumNum,
-            IFNULL( tc.sumNum, 0 ) AS hbSumNum,
-            concat(
-                    ifnull( round( ( ta.sumNum - tc.sumNum ) / tc.sumNum * 100, 0 ), 0 ),
-                    '%'
-                ) AS hbRate
-        FROM
             <choose>
                 <when test="pattern != null and pattern != ''">
-                    ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) ta
-                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
-                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
+                    <if test="pattern == '%Y-%m-%d'">
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE DATE_FORMAT( CURDATE(), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) sumNum,
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE DATE_FORMAT( DATE_SUB(CURDATE() , INTERVAL 1 DAY), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) hbSumNum
+                    </if>
+                    <if test="pattern == '%Y-%m'">
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE DATE_FORMAT( CURDATE(), '%Y-%m' ) = DATE_FORMAT(wesal.create_date, '%Y-%m' ) ) sumNum,
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE DATE_FORMAT( DATE_SUB(CURDATE() , INTERVAL 1 MONTH), '%Y-%m' ) = DATE_FORMAT(wesal.create_date, '%Y-%m' ) ) hbSumNum
+                    </if>
                 </when>
                 <otherwise>
-                    ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) ta
-                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
-                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
+                    ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE DATE_FORMAT( CURDATE(), '%Y-%m' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) sumNum,
+                    ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE DATE_FORMAT( DATE_SUB(CURDATE() , INTERVAL 1 DAY), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) hbSumNum
                 </otherwise>
             </choose>
-        <where>
-            <if test="date != null and date != ''">
-                ta.`date` = #{date}
-            </if>
-        </where>
-        ORDER BY
-            ta.`date`
     </select>
     <select id="unCleanAlarmEquipLink" resultType="java.util.Map">
         SELECT
-            ta.`date`,
-            IFNULL( ta.sumNum, 0 ) AS sumNum,
-            IFNULL( tc.sumNum, 0 ) AS hbSumNum,
-            concat(
-                    ifnull( round( ( ta.sumNum - tc.sumNum ) / tc.sumNum * 100, 0 ), 0 ),
-                    '%'
-                ) AS hbRate
-        FROM
             <choose>
                 <when test="pattern != null and pattern != ''">
-                    ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL GROUP BY `date` ) ta
-                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, #{pattern} ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
-                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
+                    <if test="pattern == '%Y-%m-%d'">
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL AND DATE_FORMAT( CURDATE(), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) sumNum,
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL AND DATE_FORMAT( DATE_SUB(CURDATE() , INTERVAL 1 DAY), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) hbSumNum
+                    </if>
+                    <if test="pattern == '%Y-%m'">
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL AND DATE_FORMAT( CURDATE(), '%Y-%m' ) = DATE_FORMAT(wesal.create_date, '%Y-%m' ) ) sumNum,
+                        ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL AND DATE_FORMAT( DATE_SUB(CURDATE() , INTERVAL 1 MONTH), '%Y-%m' ) = DATE_FORMAT(wesal.create_date, '%Y-%m' ) ) hbSumNum
+                    </if>
                 </when>
                 <otherwise>
-                    ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL GROUP BY `date` ) ta
-                    LEFT JOIN ( SELECT DATE_FORMAT( wesal.create_date, '%Y-%m-%d' ) `date`, COUNT( 1 ) AS sumNum FROM wl_equipment_specific_alarm_log wesal GROUP BY `date` ) tc
-                    ON ta.`date` = date_add( tc.`date`, INTERVAL 1 DAY )
+                    ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL AND DATE_FORMAT( CURDATE(), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) sumNum,
+                    ( SELECT COUNT( DISTINCT wesal.equipment_specific_id ) AS sumNum FROM wl_equipment_specific_alarm_log wesal WHERE wesal.clean_time IS NULL AND DATE_FORMAT( DATE_SUB(CURDATE() , INTERVAL 1 DAY), '%Y-%m-%d' ) = DATE_FORMAT(wesal.create_date, '%Y-%m-%d' ) ) hbSumNum
                 </otherwise>
             </choose>
-        <where>
-            <if test="date != null and date != ''">
-                ta.`date` = #{date}
-            </if>
-        </where>
-        ORDER BY
-            ta.`date`
     </select>
     <select id="getAlarmLogInfoList" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog">
         SELECT