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

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

@@ -519,6 +519,7 @@ AND instance_id = (
 				jc_user_car
 			WHERE
 				car_id = #{carId}
+				and is_delete = 0
 		)
 ) and field_code='telephone'
 	) ss

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -184,4 +184,8 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("clean_time")
     @ApiModelProperty(value = "消除时间")
     private Date cleanTime;
+
+    @ApiModelProperty(value = "消除状态")
+    @TableField(exist = false)
+    private String cleanStatus;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/AlarmListDataVO.java

@@ -23,6 +23,8 @@ public class AlarmListDataVO {
 
     private String alarmEquip;
 
+    private String type;
+
     private String alarmType;
 
     private String alarmInfo;
@@ -34,4 +36,6 @@ public class AlarmListDataVO {
     private String alarmTypeCode;
 
     private String cleanStatus;
-}
+
+    private String cleanStatusVal;
+}
\ No newline at end of file

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
@@ -264,6 +265,55 @@ public class OrgUsrController extends BaseController {
         page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
         return page;
     }
+    /**
+     * 列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/new-list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "新列表分页查询---只查询当前登录人本单位下的对应数据信息", notes = "新列表分页查询---只查询当前登录人本单位下的对应数据信息")
+    public IPage<OrgUsr> newlistPage(String pageNum, String pageSize, OrgUsr orgUsr) {
+    	ReginParams reginParams = getSelectedOrgInfo();
+    	String   companyIdString= reginParams.getPersonIdentity().getCompanyId();
+    	orgUsr.setParentId(companyIdString);
+        Page<OrgUsr> pageBean;
+        QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
+        Class<? extends OrgUsr> aClass = orgUsr.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(orgUsr);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        orgUsrQueryWrapper.eq("is_delete", 0);
+        IPage<OrgUsr> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
+        return page;
+    }
 
     /**
      * 导入部门信息

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.runtime.directive.Break;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -158,7 +159,16 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 			}
 			resultList.add(detailMap);
 		});
-		result.add(resultList.get(0));
+		for (int i = 0; i < resultList.size(); i++) {
+
+				if (resultList.get(i).size() == 4){
+					result.add(resultList.get(i));
+				}
+				if (result.size()>0){
+					break;
+				}
+		}
+
 		return result;
 	}
 

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

@@ -323,6 +323,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
         // 发起主表流程 并添加至报修日志
         failureDetailsDto.setSubmissionTime(new Date());
+        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
         FailureDetailsDto model = this.updateWithModel(failureDetailsDto);
 
         if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {

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

@@ -85,10 +85,15 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
 
-        if (byfaultId.size() != 0) {
+        if (byfaultId.size() != 0 && status.getCode().equals(FailureStatuEnum.FINISH.getCode())) {
             failureDetailsDto.setCurrentStatus(status.getCode());
         }
 
+        if (condition ==  AuditResultEnum.REFUSE.getCode()){
+            failureDetailsDto.setCurrentStatus(status.getCode());
+        }
+
+
         failureDetailsDto.setSequenceNbr(model.getFaultId());
         failureDetailsService.updateWithModel(failureDetailsDto);
 

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

@@ -818,7 +818,7 @@ public class MaintenanceCompanyServiceImpl
         // 查询公司下人列表
         List<MaintenanceCompany> personList = list(new LambdaQueryWrapper<MaintenanceCompany>()
                 .eq(MaintenanceCompany::getIsDelete, false).eq(MaintenanceCompany::getType, PERSON)
-                .likeRight(MaintenanceCompany::getCode, company.getCode()));
+                .eq(MaintenanceCompany::getParentId,company.getParentId()));
         List<Long> instanceIdList = Lists.transform(personList, MaintenanceCompany::getInstanceId);
         // 查询手机号
         List<DynamicFormInstance> dynamicFormInstanceList = dynamicFormInstanceService
@@ -831,7 +831,7 @@ public class MaintenanceCompanyServiceImpl
             Map<String, Object> map = Maps.newHashMap();
             map.put("sequenceNbr", person.getSequenceNbr());
             map.put("name", person.getName());
-            map.put("tel", dyMap.get(person.getInstanceId()).get(0).getFieldValue());
+            map.put("tel", dyMap.get(person.getInstanceId()) != null ? dyMap.get(person.getInstanceId()).get(0).getFieldValue() : null);
             resultList.add(map);
         });
         return resultList;

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

@@ -123,6 +123,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         }
 
         videoBySpeId.forEach(action -> {
+            action.setVedioFormat(vedioFormat);
             action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
         });
         res.put("data", specificAlarm);

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

@@ -119,7 +119,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         equipmentDetail.setEquPropertyList(equPropertyList);
         ManufacturerInfo manufacturerInfo = manufacturerInfoMapper.selectById(equipmentDetail.getManufacturerId());
         if (manufacturerInfo != null) {
-            manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
+            manufacturerInfo.setImg(manufacturerInfo.getImg());
         }
         equipmentDetail.setManufacturerInfo(manufacturerInfo);
         equipmentDetail.setImg(getEquipFileList(id, FileTypeEnum.image.toString()));

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

@@ -208,11 +208,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         || AlarmTypeEnum.PB.getCode().equals(type)) {
                     dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
+                dataVO.setType(String.valueOf(x.get("type")));
                 dataVO.setAlarmInfo(x.get("fireEquipmentName") + dataVO.getAlarmType());
                 dataVO.setEquipSpeId(Long.valueOf(String.valueOf(x.get("fireEquipmentId"))));
                 dataVO.setAlarmId(Long.valueOf(String.valueOf(x.get("alarmId"))));
                 dataVO.setAlarmTypeCode(String.valueOf(x.get("fireEquipmentSpecificIndexKey")));
                 dataVO.setCleanStatus(String.valueOf(x.get("cleanStatus")));
+                dataVO.setCleanStatusVal(String.valueOf(x.get("cleanStatusVal")));
                 res.add(dataVO);
             });
         }

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

@@ -121,7 +121,11 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         String aircraft = "";
         List<AlertFormValue> list1 =  list.stream().filter(formValue -> formValue.getFieldCode().equals("aircraft") || formValue.getFieldCode().equals("aircraftModel")).collect(Collectors.toList());
         if(list1.size() > 0) {
-            aircraft = list1.get(0).getFieldValueCode();
+            if(ValidationUtil.isEmpty(list1.get(0).getFieldValue())) {
+                aircraft = list1.get(0).getFieldValue();
+            } else {
+                aircraft = list1.get(0).getFieldValueCode();
+            }
         }
 
         LambdaQueryWrapper<Aircraft> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -640,11 +640,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			/*
 			 * if(null == valueCode) { valueCode = alertFormValue.getFieldValue(); }
 			 */
-//			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
-//				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
-//			} else  {
-				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
-//			}
+			if("flightNumber".equals(alertFormValue.getFieldCode())) {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(),  alertFormValue.getFieldValueCode()));
+			} else {
+				if( "aircraftModel".equals(alertFormValue.getFieldCode())) {
+					if(ValidationUtil.isEmpty(valueCode)) {
+						listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
+					} else {
+						listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+					}
+				} else  {
+					listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+				}
+			}
 		});
 		map.put("data", listdate);
 

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

@@ -1491,7 +1491,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         if (designatedDriver) {
                             // 发送单个车辆的信息数据到客户
                             smsParams.put("resourcesNum",
-                                    resourcesNum.toString().substring(resourcesNum.toString().length() - 2));
+                                    resourcesNum.toString());
                             List<AlertSubmittedObject> alertSubmittedObjectListSub = Lists.newArrayList();
                             Map<String, Object> map = dynamicFormInstanceMapper
                                     .getCurentCarIsUserPhone(Long.parseLong(i.getResourcesId()));

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

@@ -543,10 +543,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             responseLevel = list1.get(0).getFieldValue();
         }
 
-        definitions.put("rescueGrid", alertCalled.getAddress());
+        definitions.put("rescueGrid", ValidationUtil.isEmpty(alertCalled.getAddress() ) ? "" : alertCalled.getAddress());
         definitions.put("type", alertCalled.getAlertType());
-        definitions.put("contactUser", alertCalled.getContactUser());
-        definitions.put("contactPhone", alertCalled.getContactPhone());
+        definitions.put("contactUser", ValidationUtil.isEmpty(alertCalled.getContactUser() ) ? "" : alertCalled.getContactUser());
+        definitions.put("contactPhone", ValidationUtil.isEmpty(alertCalled.getContactPhone() ) ? "" : alertCalled.getContactPhone());
         definitions.put("replaceContent", replaceContent);
         definitions.put("responseLevel", responseLevel);
         definitions.put("callTime",

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

@@ -586,4 +586,14 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(page);
     }
 
+    /**
+     * 根据检查记录查询照片
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "根据检查记录查询照片", notes = "根据检查记录查询照片")
+    @RequestMapping(value = "/getPictureByCheckId", method = RequestMethod.GET)
+    public CommonResponse getPictureByCheckId(@ApiParam(value = "检查记录ID") @RequestParam String checkId) {
+        List<String> pictures = checkService.getPictureByCheckId(checkId);
+        return CommonResponseUtil.success(pictures);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/CheckMapper.java

@@ -304,4 +304,6 @@ public interface CheckMapper extends BaseMapper {
      * @return
      */
     List<Check> getCheckListByTaskId(@Param(value = "planTaskId") long id);
+
+    List<String> getPictureByCheckId(String checkId);
 }

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

@@ -1685,5 +1685,8 @@ public class CheckServiceImpl implements ICheckService {
         return result;
     }
 
-
+    @Override
+    public List<String> getPictureByCheckId(String checkId) {
+        return checkMapper.getPictureByCheckId(checkId);
+    }
 }

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

@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
@@ -207,14 +208,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             //组织业务基本数据 对应bizInfo
             HiddenDangerDto hiddenDangerDto = new HiddenDangerDto();
             hiddenDangerDto.setPlanId(planId);
-            hiddenDangerDto.setPointId(pointArray.length > 1 ? Long.parseLong(pointArray[1]) : null);
+            hiddenDangerDto.setPointId(pointArray.length > 1 ? Long.parseLong(StringUtils.trimAllWhitespace(pointArray[1])) : null);
+            hiddenDangerDto.setPointName(pointArray.length > 1 ? pointArray[0] : null);
             hiddenDangerDto.setCheckInputId(seq);
             hiddenDangerDto.setDangerType(DangerHandleTypeEnum.SELF.getCode());
             try {
                 dangerDto.setBizInfo(this.buildBizInfo(hiddenDangerDto));
             } catch (Exception e) {
-                log.error(e.getMessage(),e);
-                throw new RuntimeException("组织数据失败");
+                log.error(e.getMessage(), e);
+                throw new RuntimeException("组织数据失败!" + e.getMessage());
             }
             return dangerDto;
         }).collect(Collectors.toList());
@@ -273,6 +275,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         Point point = new Point();
         if (!ObjectUtils.isEmpty(hiddenDangerDto.getPointId())) {
             point = iPointDao.findById(hiddenDangerDto.getPointId()).orElseThrow(() -> new RuntimeException("单位不存在"));
+        } else {
+            throw new RuntimeException("单位不存在");
         }
         //检查级别
         DangerCheckTypeLevelEnum dangerCheckTypeLevelEnum = DangerCheckTypeLevelEnum.getEumByCode(plan.getCheckLevel());
@@ -288,8 +292,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("bizId", hiddenDangerDto.getCheckInputId());
         result.put("bizName", hiddenDangerDto.getInputItemName());
         result.put("routeId", plan.getRouteId());
-        result.put("checkUnitId",plan.getCheckUnitId()); // 检查人所在单位id逗号隔开
-        result.put("checkUnitName",plan.getCheckUnitName());// 检查人所在单位名称逗号隔开
+        result.put("checkUnitId", plan.getCheckUnitId()); // 检查人所在单位id逗号隔开
+        result.put("checkUnitName", plan.getCheckUnitName());// 检查人所在单位名称逗号隔开
         result.put("leadPeopleId", plan.getLeadPeopleIds()); // 牵头人id
         result.put("leadPeopleName", plan.getLeadPeopleNames()); // 牵头人名称
         result.put("makerUserId", plan.getMakerUserId()); // 计划制定人id
@@ -314,7 +318,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("checkUserId", checkInput.getUserId()); // 任务执行人id
         result.put("checkUserName", checkInput.getUserName()); // 任务执行人名称
         result.put("accompanyingUserId", checkInput.getAccompanyUserId()); // 检查陪同人id
-        result.put("accompanyingUserName",checkInput.getAccompanyUserName()); // 检查陪同人名称
+        result.put("accompanyingUserName", checkInput.getAccompanyUserName()); // 检查陪同人名称
         result.put("planExecuteTime", checkInput.getCreateDate()); // 计划任务执行时间
         result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(",")));
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/ICheckService.java

@@ -282,4 +282,6 @@ public interface ICheckService {
     int checkHasRecord(Long planTaskId, Long pointId);
 
     Page<CheckVo> queryPage(CheckPageParam criterias);
+
+    List<String> getPictureByCheckId(String checkId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/CheckVo.java

@@ -9,7 +9,10 @@ import java.util.Date;
  */
 @Data
 public class CheckVo {
-
+    /**
+     * checkId
+     */
+    private Long checkId;
     /**
      * 主键id
      */

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

@@ -44,7 +44,9 @@
 			confirm_user,
 			confirm_user_name,
 			confirm_date,
-			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName
+			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName,
+			if(ala.clean_time is null, '未清除', '已清除') AS cleanStatus,
+			ala.clean_time
         from
             wl_equipment_specific_alarm_log as ala
         left join wl_equipment_specific as spe on spe.id = ala.equipment_specific_id

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

@@ -311,6 +311,11 @@
         '已消除',
         '未消除'
         ) cleanStatus,
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '1',
+        '2'
+        ) cleanStatusVal,
         wlesal.confirm_type AS handleType,
         wlesal.system_codes AS systemCodes,
         wlesal.equipment_index_id AS fireEquipmentIndexId,
@@ -370,7 +375,7 @@
         </choose>
         <if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if>
         <if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if>
-        <if test="param.alarmType == 'BREAKDOWN' or param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
+        <if test="param.alarmType != null and param.alarmType != ''">AND d.type = #{param.alarmType}</if>
         <if test="param.systemCode != null and param.systemCode != ''">
             AND find_in_set(#{param.systemCode},d.systemCodes)
         </if>

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

@@ -9,10 +9,10 @@
             ci.input_name as inputItemName,
             ci.user_name as checkUserName,
             ci.create_date as checkTime,
-            c.point_name
+            pp.name as pointName
         FROM `p_hidden_danger` phd
         left join  p_check_input ci on phd.check_input_id = ci.id
-        left join  p_check c on c.id = phd.check_id
+        left join  p_point pp on pp.id = phd.point_id
         <where>
             <if test="planId !=null and planId != ''">and phd.plan_id=#{planId}</if>
             <if test="pointId !=null and pointId != ''">and phd.point_id=#{pointId}</if>