Merge remote-tracking branch 'origin/developer' into developer

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/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/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-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>