|
|
@@ -2,7 +2,6 @@ package com.gis.cms.service.impl;
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
@@ -21,7 +20,6 @@ import com.gis.cms.mapper.HotelMapper;
|
|
|
import com.gis.cms.service.ContactService;
|
|
|
import com.gis.cms.service.HotelService;
|
|
|
import com.gis.cms.zhengyuan.ZhengYuanService;
|
|
|
-import com.gis.common.base.entity.po.LogEntity;
|
|
|
import com.gis.common.base.exception.BaseRuntimeException;
|
|
|
import com.gis.common.base.service.LogService;
|
|
|
import com.gis.common.base.service.impl.IBaseService;
|
|
|
@@ -32,13 +30,11 @@ import com.gis.common.util.DateUtils;
|
|
|
import com.gis.common.util.ExcelUtils;
|
|
|
import com.gis.common.util.Result;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.slf4j.MDC;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.*;
|
|
|
-import java.util.concurrent.ExecutorService;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
@@ -316,7 +312,6 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
|
|
|
rowTitle.put("usable", "房间可用");
|
|
|
rowTitle.put("touch", "密接人数");
|
|
|
rowTitle.put("touchSecond", "次密人数数");
|
|
|
-// rowTitle.put("contact", "联系人");
|
|
|
rowTitle.put("remark", "备注");
|
|
|
rowTitle.put("caseSign", "签约情况");
|
|
|
rowTitle.put("caseAccept", "验收情况");
|
|
|
@@ -385,9 +380,6 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
|
|
|
}
|
|
|
|
|
|
// 合并后的联系人信息
|
|
|
-// vo = new ContactTypeVo();
|
|
|
-// vo.setId(contactMap.getKey());
|
|
|
-// vo.setName(builder.toString());
|
|
|
resGroupType.put(contactMap.getKey().toString(), builder.toString());
|
|
|
}
|
|
|
resMap.put(entry.getKey(), resGroupType);
|
|
|
@@ -402,8 +394,6 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
|
|
|
if (row.getId().equals(entry.getKey())){
|
|
|
// 类型人类型
|
|
|
Map<String, String> value = entry.getValue();
|
|
|
-// System.out.println("==================" + value.get(1));
|
|
|
-// System.out.println("==================" + value.get(2));
|
|
|
row.setC1(value.get("1"));
|
|
|
row.setC2(value.get("2"));
|
|
|
row.setC3(value.get("3"));
|
|
|
@@ -436,4 +426,7 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
wuweihao