Merge branch 'V3.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into V3.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpMessage.java

@@ -81,6 +81,9 @@ public class TpMessage {
      */
      private  Integer transactionId;
 
+    public TpMessage() {
+    }
+
     public Integer getTransactionId() {
         return transactionId;
     }
@@ -305,4 +308,29 @@ public class TpMessage {
     public void setAnnouncementId(Integer announcementId) {
         this.announcementId = announcementId;
     }
+
+    public TpMessage(Integer ticketId, Integer communityId, String messageType, String adviceType, String modelType, Integer uuid, String uuidType, String source, String messageContent, String status, String result, String meaasgeTypeId, String readStatus, Integer createUser, Date createDate, Integer updateUser, Date updateDate, Integer billId, Integer activityId, Integer announcementId, Integer transactionId) {
+        this.ticketId = ticketId;
+        this.communityId = communityId;
+        this.messageType = messageType;
+        this.adviceType = adviceType;
+        this.modelType = modelType;
+        this.uuid = uuid;
+        this.uuidType = uuidType;
+        this.source = source;
+        this.messageContent = messageContent;
+        this.status = status;
+        this.result = result;
+        this.meaasgeTypeId = meaasgeTypeId;
+        this.readStatus = readStatus;
+        this.createUser = createUser;
+        this.createDate = createDate;
+        this.updateUser = updateUser;
+        this.updateDate = updateDate;
+        this.billId = billId;
+        this.activityId = activityId;
+        this.announcementId = announcementId;
+        this.transactionId = transactionId;
+    }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -596,6 +596,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setUuidName(userElement.getUserName());
         tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
 
+        TpTransactionReply tpTransactionReplyBack = new TpTransactionReply();
         //replyId为空的情况下被回复人就是帖子的创建人
         if (StringUtils.isEmpty(tpTransactionReply.getReplyId())) {
             TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpTransactionReply.getTransactionId(),tpTransactionReply.getCommunityId());
@@ -611,7 +612,7 @@ public class SocialServiceImpl implements SocialServiceI {
             tpTransactionReply.setReplyUuidRole(replyRole);
             tpTransactionReply.setPublishType("1");
         }else{
-            TpTransactionReply tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
+             tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
     
             //塞入被回复人信息
             tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
@@ -636,6 +637,10 @@ public class SocialServiceImpl implements SocialServiceI {
                 tdImagesMapper.insert(tdImages);
             }
         }
+        // 推消息
+        TpMessage  tpMessage=new TpMessage(null,userElement.getCommunityId(),"11","1","1", tpTransactionReplyBack.getUuid(),"1","2",  userElement.getUserName()+":"+tpTransactionReply.getReplyContent(),
+                                          "1",null,null,"0",userElement.getUserVerifyId(),new Date(),null,null,null,null,null,tpTransactionReplyBack.getTransactionId());
+        tpMessageMapper.insert(tpMessage);
         response.addSuccess("成功");
         return response;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpShopServicelmpl.java

@@ -180,7 +180,7 @@ public class TpShopServicelmpl implements TpShopServicel {
         tpShopAppraisal.setAppraisalTel(userElement.getLoginName());
         String photo = taUserMapper.selectByPrimaryKey(userElement.getId()).getHeadPortrait();
         tpShopAppraisal.setAppraisalAvatar(photo);
-        tpShopAppraisal.setScore("1");
+        tpShopAppraisal.setSort(1);
         tpShopAppraisal.setStatus("1");
         tpShopAppraisal.setCreateUser(userElement.getUserVerifyId());
         tpShopAppraisal.setCreateDate(new Date());

CODE/smart-community/app-api/src/main/resources/mapper/TpShopAppraisalMapper.xml

@@ -177,9 +177,25 @@
 
   <select id="shopEvaluateList" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from tp_shop_appraisal where shop_id = #{shopID,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER} and status = 1
-  </select>
+     sa.id,
+     sa.community_id,
+     sa.shop_id,
+     sa.score,
+     sa.content,
+     sa.appraisal_people,
+     sa.appraisal_tel,
+     sa.appraisal_avatar,
+     sa.sort,
+     sa.STATUS,
+     sa.create_user,
+     sa.create_date
+     from tp_shop_appraisal sa
+     left join tp_shop_appraisal_replay sar on sa.id = sar.shop_appraisal_id
+     where sa.shop_id = #{shopID,jdbcType=INTEGER}
+     and sa.community_id = #{communityId,jdbcType=INTEGER}
+     and sa.status = 1
+     order by sa.sort desc,sar.update_date desc,sar.create_date desc
+</select>
 
   <select id="evaluateCount" resultType="int">
     select

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopController.java

@@ -3,6 +3,7 @@ package com.community.huiju.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
@@ -16,12 +17,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
@@ -168,4 +164,84 @@ public class TpShopController extends BaseController {
 		}
 		return responseBean;
 	}
+
+	@ApiOperation(value = "线下商铺评价列表", notes = "线下商铺评价列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "商铺编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "shopName", value = "商铺名称"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "score", value = "商铺名称"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "content", value = "评价内容"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "appraisalPeople", value = "评价人"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "appraisalTel", value = "评价人电话"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+	})
+	@RequestMapping(value = "/shopAppraisalList",method = RequestMethod.GET)
+	public ResponseBean shopAppraisalList(@RequestParam(value = "id",required = false) Integer id,
+									@RequestParam(value = "shopName",required = false) String shopName,
+									@RequestParam(value = "score",required = false) String score,
+									@RequestParam(value = "content",required = false) String content,
+									@RequestParam(value = "appraisalPeople",required = false) String appraisalPeople,
+									@RequestParam(value = "appraisalTel",required = false) String appraisalTel,
+									@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									@RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+									HttpSession session) {
+		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = shopService.shopAppraisalList(id,shopName,score,content,appraisalPeople,appraisalTel,userElement,pageNum,pageSize);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "线下商铺回复评价和修改评价", notes = "线下商铺回复评价和修改评价")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "评论ID"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "replayContent", value = "内容"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "code", value = "1:添加，2:修改"),
+	})
+	@RequestMapping(value = "/shopAppraisalReplay/AddandEditor",method = RequestMethod.POST)
+	public ResponseBean shopAppraisalReplayAddandEditor(@RequestParam(value = "id") Integer id,
+											@RequestParam(value = "replayContent") String replayContent,
+											@RequestParam(value = "code") Integer code,
+										  	HttpSession session) {
+		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = shopService.shopAppraisalReplayAddandEditor(id,userElement,replayContent,code);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "线下商铺回复评论详情", notes = "线下商铺回复评论详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "评论ID"),
+	})
+	@RequestMapping(value = "/shopAppraisal/details",method = RequestMethod.GET)
+	public ResponseBean shopAppraisalDetails(@RequestParam(value = "id") Integer id) {
+		ResponseBean responseBean = shopService.shopAppraisalDetails(id);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "线下商铺评论上架和下架", notes = "线下商铺评论上架和下架")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "评论ID[],status:上架，2下架"),
+	})
+	@RequestMapping(value = "/shopAppraisal/Status",method = RequestMethod.POST)
+	public ResponseBean shopAppraisalStatus(@RequestBody String parameter,
+												  HttpSession session ) {
+		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = shopService.shopAppraisalStatus(parameter,userElement);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "线下商铺评论修改权重", notes = "线下商铺评论修改权重")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "评论ID"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "sort", value = "权重值"),
+	})
+	@RequestMapping(value = "/shopAppraisalSort/Sort",method = RequestMethod.POST)
+	public ResponseBean shopAppraisalSort(@RequestParam(value = "id") Integer id,
+												  @RequestParam(value = "sort") Integer sort,
+												  HttpSession session ) {
+		UserElement userElement = getUserElement(session);
+		ResponseBean responseBean = shopService.shopAppraisalSort(id,sort,userElement);
+		return responseBean;
+	}
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/ShopAppraisalMapper.java

@@ -0,0 +1,33 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.ShopAppraisal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 商铺评价表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-04
+ */
+@Mapper
+public interface ShopAppraisalMapper extends BaseMapper<ShopAppraisal> {
+
+    /**
+     * 线下商铺评价列表
+     * @param page
+     * @param id
+     * @param shopName
+     * @param score
+     * @param content
+     * @param appraisalPeople
+     * @param appraisalTel
+     * @return
+     */
+    IPage<ShopAppraisal> ticketList(Page page, @Param("id") Integer id, @Param("shopName")String shopName, @Param("score")String score, @Param("content")String content, @Param("appraisalPeople")String appraisalPeople, @Param("appraisalTel")String appraisalTel);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/ShopAppraisalReplayMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.ShopAppraisalReplay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 商铺回复表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-04
+ */
+@Mapper
+public interface ShopAppraisalReplayMapper extends BaseMapper<ShopAppraisalReplay> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Message.java

@@ -3,6 +3,8 @@ package com.community.huiju.model;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -129,4 +131,31 @@ public class Message implements Serializable {
      */
     private Integer transactionId;
 
+    public Message(Integer ticketId, Integer communityId, String messageType, String adviceType, String modelType, Integer uuid, String uuidType, String source, String messageContent, String status, String result, String meaasgeTypeId, String readStatus, Integer createUser, LocalDateTime createDate, Integer updateUser, LocalDateTime updateDate, Integer billId, Integer activityId, Integer announcementId, Integer transactionId) {
+        this.ticketId = ticketId;
+        this.communityId = communityId;
+        this.messageType = messageType;
+        this.adviceType = adviceType;
+        this.modelType = modelType;
+        this.uuid = uuid;
+        this.uuidType = uuidType;
+        this.source = source;
+        this.messageContent = messageContent;
+        this.status = status;
+        this.result = result;
+        this.meaasgeTypeId = meaasgeTypeId;
+        this.readStatus = readStatus;
+        this.createUser = createUser;
+        this.createDate = createDate;
+        this.updateUser = updateUser;
+        this.updateDate = updateDate;
+        this.billId = billId;
+        this.activityId = activityId;
+        this.announcementId = announcementId;
+        this.transactionId = transactionId;
+    }
+
+    public  Message(){
+
+    }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/ShopAppraisal.java

@@ -0,0 +1,106 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商铺评价表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_shop_appraisal")
+public class ShopAppraisal implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 商铺ID
+     */
+    private Integer shopId;
+
+    /**
+     * 评分 0- 5
+     */
+    private String score;
+
+    /**
+     * 评价内容
+     */
+    private String content;
+
+    /**
+     * 评价人
+     */
+    private String appraisalPeople;
+
+    /**
+     * 评价人手机号
+     */
+    private String appraisalTel;
+
+    /**
+     * 评价人头像
+     */
+    private String appraisalAvatar;
+
+    /**
+     * 权重
+     */
+    private Integer sort;
+
+    /**
+     * 评价状态 1 是有效  0 是无效
+     */
+    private String status;
+
+    /**
+     * 创建人ID
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 商铺名称
+     */
+    @TableField(exist = false)
+    private String shopName;
+
+    /**
+     * 回复内容
+     */
+    @TableField(exist = false)
+    private String replayContent;
+
+    /**
+     * 回复人
+     */
+    @TableField(exist = false)
+    private  String replayPeople;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/ShopAppraisalReplay.java

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商铺回复表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_shop_appraisal_replay")
+public class ShopAppraisalReplay implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 商铺评论ID
+     */
+    private Integer shopAppraisalId;
+
+    /**
+     * 回复内容
+     */
+    private String replayContent;
+
+    /**
+     * 回复人
+     */
+    private String replayPeople;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpShopService.java

@@ -50,4 +50,52 @@ public interface ITpShopService extends IService<TpShop> {
 	 * @return
 	 */
 	ResponseBean updateShop(TpShop shop, UserElement userElement);
+
+	/**
+	 * 线下商铺评价列表
+	 * @param id
+	 * @param shopName
+	 * @param score
+	 * @param content
+	 * @param appraisalPeople
+	 * @param appraisalTel
+	 * @param userElement
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+    ResponseBean shopAppraisalList(Integer id, String shopName, String score, String content, String appraisalPeople, String appraisalTel, UserElement userElement, Integer pageNum, Integer pageSize);
+
+	/**
+	 * 线下商铺回复评价
+	 * @param id
+	 * @param userElement
+	 * @param replayContent
+	 * @return
+	 */
+	ResponseBean shopAppraisalReplayAddandEditor(Integer id, UserElement userElement, String replayContent,Integer code);
+
+	/**
+	 * 线下商铺评论详情
+	 * @param id
+	 * @return
+	 */
+	ResponseBean shopAppraisalDetails(Integer id);
+
+	/**
+	 * 线下商铺评论上架和下架
+	 * @param parameter
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean shopAppraisalStatus(String parameter, UserElement userElement);
+
+	/**
+	 * 下商铺修改权重
+	 * @param id
+	 * @param sort
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean shopAppraisalSort(Integer id, Integer sort, UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopServiceImpl.java

@@ -1,15 +1,19 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 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;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.dao.ShopAppraisalMapper;
+import com.community.huiju.dao.ShopAppraisalReplayMapper;
 import com.community.huiju.dao.TpShopImgMapper;
 import com.community.huiju.dao.TpShopMapper;
-import com.community.huiju.model.TpShop;
-import com.community.huiju.model.TpShopImg;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITpShopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +42,12 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 	
 	@Autowired
 	private TpShopImgMapper shopImgMapper;
+
+	@Autowired
+	private ShopAppraisalMapper shopAppraisalMapper;
+
+	@Autowired
+	private ShopAppraisalReplayMapper shopAppraisalReplayMapper;
 	
 	/**
 	 * 根据条件查询商铺列表
@@ -211,4 +221,91 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 		responseBean.addSuccess("修改成功");
 		return responseBean;
 	}
+
+	@Override
+	public ResponseBean shopAppraisalList(Integer id, String shopName, String score, String content, String appraisalPeople, String appraisalTel, UserElement userElement, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean= new ResponseBean<>();
+		Page<ShopAppraisal> page = new Page();
+		page.setCurrent(pageNum);
+		page.setSize(pageSize);
+		IPage<ShopAppraisal> pageInfo = shopAppraisalMapper.ticketList(page,id,shopName,score,content,appraisalPeople,appraisalTel);
+		Map<String,Object> map = new HashMap<>();
+		map.put("list", pageInfo);
+		map.put("total", page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+
+	@Override
+	public ResponseBean shopAppraisalReplayAddandEditor(Integer id, UserElement userElement, String replayContent,Integer code) {
+		ResponseBean responseBean= new ResponseBean();
+		// 添加回复
+		int codes = code.intValue();
+		if (codes == 1) {
+		ShopAppraisalReplay shopAppraisalReplay= new ShopAppraisalReplay();
+			shopAppraisalReplay.setCommunityId(userElement.getCommunityId())
+					           .setShopAppraisalId(id)
+							   .setReplayContent(replayContent)
+							   .setReplayPeople(userElement.getUserName())
+					           .setCreateUser(userElement.getId())
+							   .setCreateDate(LocalDateTime.now());
+			shopAppraisalReplayMapper.insert(shopAppraisalReplay);
+		}
+		// 修改回复
+		if (codes == 2){
+			// 根据小区查询当前回复信息
+			QueryWrapper<ShopAppraisalReplay> shopAppraisalReplayQueryWrapper= new QueryWrapper<>();
+			shopAppraisalReplayQueryWrapper.eq("shop_appraisal_id",id);
+			shopAppraisalReplayQueryWrapper.eq("community_id",userElement.getCommunityId());
+			ShopAppraisalReplay shopAppraisalReplayQuery= shopAppraisalReplayMapper.selectOne(shopAppraisalReplayQueryWrapper);
+			shopAppraisalReplayQuery.setReplayContent(replayContent)
+									.setUpdateUser(userElement.getId())
+									.setUpdateDate(LocalDateTime.now());
+			shopAppraisalReplayMapper.updateById(shopAppraisalReplayQuery);
+		}
+		responseBean.addSuccess("成功");
+		return responseBean;
+	}
+
+	@Override
+	public ResponseBean shopAppraisalDetails(Integer id) {
+		ResponseBean responseBean= new ResponseBean<>();
+		// 评论详情
+		ShopAppraisal shopAppraisal= shopAppraisalMapper.selectById(id);
+		// 回复详情
+		QueryWrapper<ShopAppraisalReplay> shopAppraisalReplayQueryWrapper= new QueryWrapper<>();
+		shopAppraisalReplayQueryWrapper.eq("shop_appraisal_id",id);
+		shopAppraisalReplayQueryWrapper.eq("community_id",shopAppraisal.getCommunityId());
+		ShopAppraisalReplay shopAppraisalReplay = shopAppraisalReplayMapper.selectOne(shopAppraisalReplayQueryWrapper);
+		Map<String,Object> map = new HashMap<>();
+		map.put("shopAppraisal",shopAppraisal);
+		map.put("shopAppraisalReplay",shopAppraisalReplay);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+
+	@Override
+	public ResponseBean shopAppraisalStatus(String parameter, UserElement userElement) {
+		ResponseBean responseBean= new ResponseBean<>();
+		JSONObject object = JSONObject.parseObject(parameter);
+		String status = object.getString("status");
+		Integer[] arrayList = object.getJSONArray("id").toArray(new Integer[]{});
+		for (Integer id:arrayList) {
+			ShopAppraisal shopAppraisal = new ShopAppraisal();
+			shopAppraisal.setId(id).setStatus(status);
+			shopAppraisalMapper.updateById(shopAppraisal);
+		}
+		responseBean.addSuccess("成功");
+		return responseBean;
+	}
+
+	@Override
+	public ResponseBean shopAppraisalSort(Integer id, Integer sort, UserElement userElement) {
+		ResponseBean responseBean= new ResponseBean<>();
+		ShopAppraisal shopAppraisal= new ShopAppraisal();
+		shopAppraisal.setId(id).setSort(sort);
+		shopAppraisalMapper.updateById(shopAppraisal);
+		responseBean.addSuccess("成功");
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -61,6 +61,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	@Autowired
 	private TaSysRoleMapper taSysRoleMapper;
 
+	@Autowired
+	private  MessageMapper tpMessageMapper;
+
 
 	@Override
 	public ResponseBean getTransactionList(String parameter,Integer communityId) {
@@ -393,6 +396,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 			tdImages.setCreateUser(userElement.getId());
 			tdImagesMapper.insert(tdImages);
 		}
+		Message  tpMessage=new Message(null,userElement.getCommunityId(),"11","1","1", tpTransaction.getUuid(),"1","2",  userElement.getUserName()+":"+ replyContent,
+				"1",null,null,"0",userElement.getUserVerifyId(),LocalDateTime.now(),null,null,null,null,null,tpTransaction.getId());
+		tpMessageMapper.insert(tpMessage);
 		response.addSuccess("成功");
 		return response;
 	}

CODE/smart-community/property-api/src/main/resources/mapper/ShopAppraisalMapper.xml

@@ -0,0 +1,36 @@
+<?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.community.huiju.dao.ShopAppraisalMapper">
+    <select id="ticketList" resultType="com.community.huiju.model.ShopAppraisal">
+        SELECT
+            *,
+            s.shop_name as shopName,
+            ar.replay_content as replayContent,
+            ar.replay_people as replayPeople
+        FROM
+            tp_shop_appraisal sa
+        LEFT JOIN tp_shop s ON sa.shop_id = s.id
+        LEFT JOIN tp_shop_appraisal_replay ar ON sa.id = ar.shop_appraisal_id
+        <where>
+            <if test="id !=null and id != ''">
+                and sa.id like concat('%',#{id},'%')
+            </if>
+            <if test="shopName !=null and shopName != ''">
+                and s.shop_name like concat('%',#{shopName},'%')
+            </if>
+            <if test="score !=null and score != ''">
+                and sa.score like concat('%',#{score},'%')
+            </if>
+            <if test="content !=null and content != ''">
+                and sa.content like concat('%',#{content},'%')
+            </if>
+            <if test="appraisalPeople !=null and appraisalPeople != ''">
+                and sa.appraisal_people like concat('%',#{appraisalPeople},'%')
+            </if>
+            <if test="appraisalTel !=null and appraisalTel != ''">
+                and sa.appraisal_tel like concat('%',#{appraisalTel},'%')
+            </if>
+        </where>
+        order by sa.sort desc,sa.create_date desc
+    </select>
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/ShopAppraisalReplayMapper.xml

@@ -0,0 +1,5 @@
+<?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.community.huiju.dao.ShopAppraisalReplayMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/api/shopType.js

@@ -109,3 +109,59 @@ export function fetchShopTypeSelect(query) {
   })
 }
 
+export function shopAppraisalList(data) {
+  return request({
+    url: '/shopAppraisalList',
+    method: 'get',
+    params: {
+      id: data.id,
+      shopName: data.shopName,
+      score: data.score,
+      content: data.content,
+      appraisalPeople: data.appraisalPeople,
+      appraisalTel: data.appraisalTel,
+      pageSize: data.pageSize,
+      pageNum: data.pageNum
+    }
+  })
+}
+export function shopAppraisalDetails(data) {
+  return request({
+    url: '/shopAppraisal/details',
+    method: 'get',
+    params: {
+      id: data.id
+    }
+  })
+}
+export function shopAppraisalReplayAddandEditor(data) {
+  return request({
+    url: '/shopAppraisalReplay/AddandEditor',
+    method: 'post',
+    params: {
+      id: data.id,
+      replayContent: data.replayContent,
+      code: data.code
+    }
+  })
+}
+export function shopAppraisalStatuss(data) {
+  return request({
+    url: '/shopAppraisal/Status',
+    method: 'post',
+    data: {
+      id: data.ides,
+      status: data.status
+    }
+  })
+}
+export function shopAppraisalSort(data) {
+  return request({
+    url: '/shopAppraisalSort/Sort',
+    method: 'post',
+    params: {
+      id: data.id,
+      sort: data.sort
+    }
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -414,6 +414,12 @@ export const constantRouterMap = [
         name: 'shop-edit',
         hidden: true,
         meta: { title: '修改商铺信息', icon: 'table' }
+      },
+      {
+        path: '/shop/shopReplay/index',
+        component: () => import('@/views/shop/shopReplay/index'),
+        name: 'shop-shopReplay',
+        meta: { title: '评价列表', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/shopType.js

@@ -1,4 +1,4 @@
-import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect, addShop, getShop, updateShop, shelfShop, obtainedShop } from '@/api/shopType'
+import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect, addShop, getShop, updateShop, shelfShop, obtainedShop, shopAppraisalList, shopAppraisalDetails, shopAppraisalReplayAddandEditor, shopAppraisalStatuss, shopAppraisalSort } from '@/api/shopType'
 
 const transaction = {
   namespaced: true,
@@ -128,6 +128,51 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    ShopAppraisalList({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        shopAppraisalList(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ShopAppraisalDetails({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        shopAppraisalDetails(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ShopAppraisalReplayAddandEditor({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        shopAppraisalReplayAddandEditor(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ShopAppraisalStatuss({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        shopAppraisalStatuss(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ShopAppraisalSort({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        shopAppraisalSort(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/shop/shopReplay/index.vue

@@ -0,0 +1,403 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item"  label="商铺编号">
+        <el-input v-model="listQuery.id"  placeholder="商铺编号"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="商铺名称">
+        <el-input v-model="listQuery.shopName" placeholder="商铺名称"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="评价分数">
+        <el-select v-model="listQuery.score" placeholder="评价分数">
+         <el-option label="请选择" value=""/>
+         <el-option label="1" value="1"/>
+         <el-option label="2" value="2"/>
+         <el-option label="3" value="3"/>
+         <el-option label="4" value="4"/>
+         <el-option label="5" value="5"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="评价内容">
+        <el-input  v-model="listQuery.content" placeholder="评价内容"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="评价人">
+        <el-input  v-model="listQuery.appraisalPeople" placeholder="评价人"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="评价人手机号">
+        <el-input  v-model="listQuery.appraisalTel" placeholder="评价人手机号"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+
+      <el-row>
+      <el-button type="primary" @click=" replyAdd()">回复评价</el-button>
+      <el-button type="primary" @click="enditreply()">修改评价</el-button>
+      <el-button type="info" @click="enditandAdd(0)">下架评价</el-button>
+      <el-button type="info" @click="enditandAdd(1)">上架评价</el-button>
+      <span style="padding-left:20%;font-size:0.7vw;color:#C0C0C0;">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
+      </el-row>
+    </el-form>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="listData.records"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="id" label="序号" align="center"/>
+      <el-table-column prop="roomName" label="商铺名称" align="center">
+         <template slot-scope="scope" >
+          <a>
+            <!-- <span :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC"> -->
+            {{ scope.row.shopName}}
+            <!-- </span> -->
+          </a>
+      </template>
+      </el-table-column>
+      <el-table-column prop="score" label="评价分数" align="center"/>
+      <el-table-column prop="content" label="评价内容" align="center">
+      <template slot-scope="scope">
+        <a :title="scope.row.content">
+          <span style="color: #8B8378	">
+           {{ scope.row.content.length>='15'?scope.row.content.substring(0,15)+'..':scope.row.content }}
+          </span>
+          <span v-if="scope.row.content==='null'">
+           {{ scope.row.content='' }}
+          </span>
+        </a>
+       </template>
+      </el-table-column>
+      <el-table-column prop="appraisalPeople" label="评价人" align="center"/>
+      <el-table-column prop="appraisalTel" label="评价人手机" align="center"/>
+      <el-table-column prop="sort" label="评价权重" align="center">
+         <template slot-scope="scope">
+          <a><span style="color: #009FCC	" @click="sort(scope.row.id,scope.row.sort)">{{ scope.row.sort }}</span></a>
+         </template>
+      </el-table-column>
+      <el-table-column prop="replayContent" label="回复内容" align="center">
+        <template slot-scope="scope">
+        <a :title="scope.row.replayContent" v-if="scope.row.replayContent !=null">
+          <span style="color: #8B8378	">
+           {{ scope.row.replayContent.length>='15'?scope.row.replayContent.substring(0,15)+'..':scope.row.replayContent }}
+          </span>
+          <span v-if="scope.row.replayContent==='null'">
+           {{ scope.row.replayContent='' }}
+          </span>
+        </a>
+       </template>
+      </el-table-column>
+      <el-table-column prop="replayPeople" label="回复人" align="center"/>
+      <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
+      <el-table-column prop="replayContent" label="评论状态" align="center">
+        <template slot-scope="scope">
+          <span style="color: #8B8378	" v-if="scope.row.status==='0'">已下架</span>
+          <span v-if="scope.row.status==='1'">已上架</span>
+       </template>
+      </el-table-column>
+
+    </el-table>
+        <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+  </div>
+  <el-dialog title="回复评价" :visible.sync="listQuery.dialogFormVisible" :show-close="listQuery.close">
+      <el-form :model="listQuery" label-position="left">
+        <el-form-item :label-width="listQuery.formLabelWidth"  label="评价内容">
+          <span>{{ this.listQuery.content }}</span>
+        </el-form-item>
+        <el-form-item :label-width="listQuery.formLabelWidth"  label="回复内容">
+          <textarea v-model="listQuery.replayContent" placeholder="输入对上方业主评价的回复，最多100字" class="textarea-inherit" rows="8"></textarea> 
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="TransactionReplyOff">取 消</el-button>
+        <el-button type="primary" @click="TransactionReplyAdd()">确 定</el-button>
+      </div>
+    </el-dialog>
+</div>
+
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+          listQuery: {
+            id: '',
+            shopName: '',
+            score: '',
+            messageType:'',
+            content:'',
+            appraisalPeople:'',
+            replayContent:'',
+            code:'',
+            appraisalTel:'',
+            status:'',
+            pageNum: 1,
+            pageSize: 10,
+            roomStatusIds: [],
+            dialogFormVisible: false,
+            formLabelWidth: '120px',
+            close: false,
+            ides:[]       
+          },
+           deleteIds: [], // 选择的id集合
+           total: 0,
+           listLoading: true, // 加载圈
+           listData: [],
+        }
+    },
+    mounted(){
+    this.dataQuery()
+    },
+    methods:{
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('shopType/ShopAppraisalList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.listData = resData.list
+        this.listQuery.pageNum = resData.list.current
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error HotelRoom')
+      })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.id = ''
+      this.listQuery.shopName = ''
+      this.listQuery.score = ''
+      this.listQuery.content = ''
+      this.listQuery.appraisalPeople = ''
+      this.listQuery.appraisalTel = ''
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.dataQuery()
+    },
+    search() {
+      this.dataQuery()
+    },
+    handleSelectionChange(data) {
+      this.deleteIds = [] // 设置为 空
+      for (let i = 0; i < data.length; i++) {
+      this.deleteIds.push(data[i].id)
+    }
+    },
+     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+      padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    enditandAdd(state){
+      const ids = this.deleteIds
+      if (ids.length < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+      if (ids.length > 1 ) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }  
+      this.shopAppraisalStatus(state)
+   
+    },
+    clickTitle(ids){
+    this.$router.push({ name: 'grogshop-grogshopRoomEdit', query: { id: ids}})
+    },
+     // 弹出层
+    replyAdd(){
+        this.listQuery.code = 1
+        console.log('code',this.listQuery.code)
+      const ids = this.deleteIds
+      if (ids.length < 1) {
+        this.$message.error('请选择一行数据进行添加!')
+        return
+      }
+       if (ids.length > 1 ) {
+        this.$message.error('只能选择一行数据进行添加!')
+        return
+      }  
+         this.listQuery.id = ids[0]
+          this.$store.dispatch('shopType/ShopAppraisalDetails', this.listQuery).then((res) => {
+           if( res.data.shopAppraisalReplay !=null){
+             this.listQuery.id = ''
+              this.$message({
+              message: '您已回复当前评价',
+              type: 'warning'
+            });
+             return
+           }else{
+              this.listQuery.dialogFormVisible = true
+              this.ShopAppraisalDetails()
+           }       
+      }).catch(() => {
+        console.log('error ShopAppraisalDetails')
+      })
+    },
+    // 查看详情
+    ShopAppraisalDetails(state){
+         this.$store.dispatch('shopType/ShopAppraisalDetails', this.listQuery).then((res) => {
+              this.listQuery.content = res.data.shopAppraisal.content
+      }).catch(() => {
+        console.log('error ShopAppraisalDetails')
+      })
+    },
+    // 回复评论
+    TransactionReplyAdd(){
+        if (this.listQuery.replayContent ==='') {
+        this.$message.error('请输入您的回复内容')
+        return
+      }
+      this.$store.dispatch('shopType/ShopAppraisalReplayAddandEditor', this.listQuery).then((res) => {
+            this.$message({
+            message: '成功',
+            type: 'success'
+            })
+            this.listQuery.dialogFormVisible = false
+            this.listQuery.replayContent = ''
+            this.listQuery.id = ''
+            this.listQuery.content = ''
+            this.dataQuery()
+      }).catch(() => {
+        console.log('error ShopAppraisalDetails')
+      })       
+    },
+    TransactionReplyOff(){
+     this.listQuery.dialogFormVisible = false
+     this.listQuery.replayContent = ''
+     this.listQuery.id = ''
+     this.listQuery.content = ''
+    },
+    // 修改回复
+    enditreply(){
+      this.listQuery.code = 2
+      const ids = this.deleteIds
+      if (ids.length < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+       if (ids.length > 1 ) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }  
+     this.listQuery.id = ids[0]
+     this.$store.dispatch('shopType/ShopAppraisalDetails', this.listQuery).then((res) => {
+              this.listQuery.content = res.data.shopAppraisal.content
+               if(res.data.shopAppraisalReplay == null){
+                 this.listQuery.id = ''
+                 this.$message({
+                  message: '请先回复当前评价内容',
+                  type: 'warning'
+                });
+                return                
+             }
+              this.listQuery.replayContent = res.data.shopAppraisalReplay.replayContent
+              this.listQuery.dialogFormVisible = true
+      }).catch(() => {
+        console.log('error ShopAppraisalDetails')
+      }) 
+    },
+    // 上架和下架
+    shopAppraisalStatus(state){
+      const ids = this.deleteIds
+      this.listQuery.ides = ids
+      this.listQuery.status = state
+      this.$store.dispatch('shopType/ShopAppraisalStatuss', this.listQuery).then((res) => {
+        this.listQuery.id = ''
+        this.dataQuery()
+      }).catch(() => {
+        console.log('error ShopAppraisalStatuss')
+      })       
+    },
+    // 修改权重
+    sort(id,sort) {
+        this.$prompt('请输入权重值', '提示', {
+          inputValue: sort,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputPattern: /^[0-9]*$/,
+          inputErrorMessage: '请输入数字'
+        }).then(({ value }) => {
+          this.shopAppraisalStatus(value,id)
+        }).catch(() => {   
+        });
+      },
+      shopAppraisalStatus(sort,id){
+        this.listQuery.sort = sort
+        this.listQuery.id = id
+      this.$store.dispatch('shopType/ShopAppraisalSort', this.listQuery).then((res) => {
+         this.$message({
+            message: '修改成功',
+            type: 'success'
+            })
+        this.listQuery.id = ''
+        this.dataQuery()
+      }).catch(() => {
+        console.log('error ShopAppraisalStatuss')
+      })       
+    }
+  }
+}
+</script>
+
+<style>
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.spanSize{
+    color:aqua
+}
+.textarea-inherit {
+        width: 100%;
+        overflow: auto;
+        word-break: break-all;
+        /* transform:translateY(5%);  */
+        margin-left: -2.5%;
+    }
+</style>