Merge branch '长春联通电子评标室' into uat_code

# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java

src/main/java/com/chinaunicom/mall/ebtp/extend/elecRoom/controller/ElectronicEvaluationRoomController.java

@@ -0,0 +1,76 @@
+package com.chinaunicom.mall.ebtp.extend.elecRoom.controller;
+
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.entity.ElectronicEvaluationRoom;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.service.IElectronicEvaluationRoomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@RestController
+@Api(tags = "")
+@RequestMapping("/v1/ElectronicEvaluationRoom/electronicevaluationroom")
+public class ElectronicEvaluationRoomController{
+	
+	@Resource
+	private IElectronicEvaluationRoomService ielectronicEvaluationRoomService;
+	
+	/**
+	 * 插入新数据
+	 * 
+	 * @param electronicEvaluationRoom
+	 *            
+	 * @return
+	 */
+//	@ApiOperation("插入新数据")
+//	@PostMapping("/insert")
+//	public BaseResponse<Boolean> insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ElectronicEvaluationRoom electronicEvaluationRoom){
+//
+//		boolean save = ielectronicEvaluationRoomService.save(electronicEvaluationRoom);
+//
+//		return BaseResponse.success(save);
+//	}
+	
+	/**
+	 * 修改数据
+	 * 
+	 * @param electronicEvaluationRoom
+	 *            
+	 * @return
+	 */
+//	@ApiOperation("修改数据")
+//	@PostMapping("/update")
+//	public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody ElectronicEvaluationRoom electronicEvaluationRoom){
+//
+//		Boolean i = ielectronicEvaluationRoomService.updateById(electronicEvaluationRoom);
+//
+//		return BaseResponse.success(i);
+//	}
+	
+	/**
+	 * 查询数据
+	 * 
+	 * @param id
+	 *            
+	 * @return
+	 */
+	@ApiOperation("查询数据")
+	@GetMapping("/{id}")
+	public BaseResponse<ElectronicEvaluationRoom> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){
+		
+		ElectronicEvaluationRoom electronicEvaluationRoom = ielectronicEvaluationRoomService.getById(id);
+		
+		return BaseResponse.success(electronicEvaluationRoom);
+	}
+
+	
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/elecRoom/dao/ElectronicEvaluationRoomMapper.java

@@ -0,0 +1,13 @@
+package com.chinaunicom.mall.ebtp.extend.elecRoom.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.entity.ElectronicEvaluationRoom;
+
+/**
+* @auto.generated
+*/
+public interface ElectronicEvaluationRoomMapper extends BaseMapper<ElectronicEvaluationRoom> {
+
+	
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/elecRoom/dao/mapper/ElectronicEvaluationRoomMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.chinaunicom.mall.ebtp.extend.elecRoom.dao.ElectronicEvaluationRoomMapper">
+    <resultMap id="BaseResultMap"
+               type="com.chinaunicom.mall.ebtp.extend.elecRoom.entity.ElectronicEvaluationRoom">
+            <result column="id"  jdbcType="INTEGER"  property="id"/>
+            <result column="room_name"  jdbcType="VARCHAR" property="roomName"/>
+            <result column="room_capacity"  jdbcType="INTEGER"  property="roomCapacity"/>
+            <result column="meeting_name"  jdbcType="VARCHAR" property="meetingName"/>
+            <result column="meeting_item"  jdbcType="VARCHAR" property="meetingItem"/>
+            <result column="meeting_times"  jdbcType="VARCHAR" property="meetingTimes"/>
+            <result column="meeting_date"  jdbcType="VARCHAR" property="meetingDate"/>
+            <result column="book_by"  jdbcType="VARCHAR" property="bookBy"/>
+            <result column="book_tel"  jdbcType="VARCHAR" property="bookTel"/>
+            <result column="state"  jdbcType="INTEGER"  property="state"/>
+    </resultMap>
+
+    <!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
+    <update id="deleteOff" parameterType="java.lang.Long">
+        update electronic_evaluation_room
+        set
+        delete_flag="deleted"
+        where ID=#{id,jdbcType=BIGINT}
+	</update>
+</mapper>

src/main/java/com/chinaunicom/mall/ebtp/extend/elecRoom/entity/ElectronicEvaluationRoom.java

@@ -0,0 +1,87 @@
+package com.chinaunicom.mall.ebtp.extend.elecRoom.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 实体类 ElectronicEvaluationRoom
+ *
+ * @auto.generated
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "electronic_evaluation_room", autoResultMap = true)
+public class ElectronicEvaluationRoom  implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+        /**
+        * 
+        */
+        @ApiModelProperty(value = "")
+        private Integer id;
+
+        /**
+        * 评标室名称
+        */
+        @ApiModelProperty(value = "评标室名称")
+        private String roomName;
+
+        /**
+        * 容纳人数
+        */
+        @ApiModelProperty(value = "容纳人数")
+        private Integer roomCapacity;
+
+        /**
+        * 会议名称
+        */
+        @ApiModelProperty(value = "会议名称")
+        private String meetingName;
+
+        /**
+        * 会议事项
+        */
+        @ApiModelProperty(value = "会议事项")
+        private String meetingItem;
+
+        /**
+        * 会议时间
+        */
+        @ApiModelProperty(value = "会议时间")
+        private String meetingTimes;
+
+        /**
+        * 会议日期
+        */
+        @ApiModelProperty(value = "会议日期")
+        private String meetingDate;
+
+        /**
+        * 预约人
+        */
+        @ApiModelProperty(value = "预约人")
+        private String bookBy;
+
+        /**
+        * 联系方式
+        */
+        @ApiModelProperty(value = "联系方式")
+        private String bookTel;
+
+        /**
+        * 是否正常 状态0-否  1-是
+        */
+        @ApiModelProperty(value = "是否正常 状态0-否  1-是")
+        private Integer state;
+
+
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/elecRoom/service/IElectronicEvaluationRoomService.java

@@ -0,0 +1,16 @@
+package com.chinaunicom.mall.ebtp.extend.elecRoom.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.entity.ElectronicEvaluationRoom;
+
+/**
+ * 对数据表 electronic_evaluation_room 操作的 service
+ * @author Auto create
+ *
+ */
+public interface IElectronicEvaluationRoomService extends IService<ElectronicEvaluationRoom>{
+
+
+
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/elecRoom/service/impl/ElectronicEvaluationRoomServiceImpl.java

@@ -0,0 +1,17 @@
+package com.chinaunicom.mall.ebtp.extend.elecRoom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.dao.ElectronicEvaluationRoomMapper;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.entity.ElectronicEvaluationRoom;
+import com.chinaunicom.mall.ebtp.extend.elecRoom.service.IElectronicEvaluationRoomService;
+import org.springframework.stereotype.Service;
+/**
+ * 对数据表 electronic_evaluation_room 操作的 serviceImpl
+ * @auto.generated
+ *
+ */
+@Service
+public class ElectronicEvaluationRoomServiceImpl extends ServiceImpl<ElectronicEvaluationRoomMapper,ElectronicEvaluationRoom>  implements IElectronicEvaluationRoomService  {
+
+
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java

@@ -11,8 +11,6 @@ public interface BizFuncSwitchConfigMapper extends BaseMapper<BizFuncSwitchConfi
 
     Integer selectByType(String type);
 
-    String getValueByKey(@Param("key")String key);
-
     /**
      * 监督角色功能根据是否有次账号控制
      * @param role
@@ -20,4 +18,6 @@ public interface BizFuncSwitchConfigMapper extends BaseMapper<BizFuncSwitchConfi
      * @return
      */
     String selectByUser(String role,String account);
+
+    String getValueByKey(@Param("key")String key);
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java

@@ -54,7 +54,7 @@ public class HighQualityStyleServiceImpl extends ServiceImpl<HighQualityStyleMap
         query.eq(HighQualityStyle::getCategory, type);
         query.ne(HighQualityStyle::getDeleteFlag, "1").eq(HighQualityStyle::getStatus, "1").orderByAsc(HighQualityStyle::getSort);
         list = this.list(query);
-        if(!type.equals("4")){
+        if(!list.isEmpty() && !type.equals("4")){
             List<String> imageIdList = list.stream().map(HighQualityStyle::getImage).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
             BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList);
             log.info("文档中心返回：{}", queryReturn.toString());