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/controller/TpRentalHouseController.java

@@ -76,7 +76,4 @@ public class TpRentalHouseController extends BaseController{
         return responseBean;
     }
 
-
-
-
 }

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

@@ -73,6 +73,37 @@ public class TpShopController extends BaseController{
         return responseBean;
     }
 
+    @ApiOperation(value = "线下商铺评论列表", notes = "线下商铺评论列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "shopID", value ="shopID:商铺ID"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/shopEvaluate/{shopID}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseBean shopEvaluate(HttpSession session,
+                                     @PathVariable("shopID") Integer shopID,
+                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = new ResponseBean();
+        ResponseBean response = tpShopServicel.shopEvaluate(shopID,userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "线下商铺评论", notes = "线下商铺评论")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="shopID:商铺ID,score:评分0-5,content:评价内容"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/shopEvaluateAdd", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean shopEvaluateAdd(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean response = tpShopServicel.shopEvaluateAdd(paramets,userElement);
+        return response;
+    }
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpTicketAndTransactionController.java

@@ -0,0 +1,158 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.service.SocialServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+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.*;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "物业端的帖子和工单", description = "物业端的帖子和工单")
+public class TpTicketAndTransactionController {
+    @Autowired
+    private SocialServiceI socialServiceI;
+
+    @ApiOperation(value = "app端话题管理", notes = "app端话题管理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "loginName",value = "电话号码"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "status",value = "1:被举报话题,2:未读话题,3:已读话题"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "transactionTitle",value = "话题搜索"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+    })
+    @RequestMapping(value = "/transactionsManageList/{loginName}",method = RequestMethod.GET)
+    public ResponseBean tpTransactionManageList(@PathVariable(value = "loginName") String loginName,
+                                   @RequestParam(value = "status") Integer status,
+                                   @RequestParam(value = "transactionTitle", required = false) String transactionTitle,
+                                   @RequestParam(value = "communityId", required = false) Integer communityId,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+       ResponseBean tpTransactionManageList= socialServiceI.tpTransactionManageList(loginName,status,pageNum,pageSize,transactionTitle,communityId);
+       return tpTransactionManageList;
+    }
+
+    @ApiOperation(value = "app端话题管理批量作废话题",nickname ="app端话题管理批量作废话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个),loginName:电话号码,communityId:小区")})
+    @RequestMapping(value="/transactions/delete",method = RequestMethod.POST)
+    public ResponseBean transactionsDelete(@RequestBody String paramets){
+        ResponseBean  transactionsUpdata= socialServiceI.transactionsDelete(paramets);
+        return transactionsUpdata;
+    }
+
+    @ApiOperation(value = "app端话题管理清除不实举报",nickname ="app端话题管理清除不实举报")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个),loginName:电话号码,communityId:小区")})
+    @RequestMapping(value="/tpTransactionReport/delete",method = RequestMethod.POST)
+    public ResponseBean tpTransactionReportDelete(@RequestBody String paramets){
+        ResponseBean  transactionsUpdata= socialServiceI.tpTransactionReportDelete(paramets);
+        return transactionsUpdata;
+    }
+
+    @ApiOperation(value = "app端话题管理添加话题",nickname ="app端话题管理添加话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="loginName:电话,communityId:小区ID，transactionTitle:话题标题，" +
+                    "type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
+    @RequestMapping(value="/transactions/add",method = RequestMethod.POST)
+    public ResponseBean transactionsAdd(@RequestBody String paramets){
+        ResponseBean  addAnnouncement= socialServiceI.transactionsAdd(paramets);
+        return addAnnouncement;
+    }
+
+    @ApiOperation(value = "app端话题管理批量已读话题",nickname ="app端话题管理批量已读话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个),loginName:电话号码,communityId:小区")})
+    @RequestMapping(value="/transactions/read",method = RequestMethod.POST)
+    public ResponseBean transactionsRead(@RequestBody String paramets){
+        ResponseBean  transactionsUpdata= socialServiceI.transactionsRead(paramets);
+        return transactionsUpdata;
+    }
+
+    @ApiOperation(value = "app端工单管理列表", notes = "app端工单管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "loginName",value = "电话号码"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "status",value = "0:待分配,3正在处理，9:其他状态"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+    })
+    @RequestMapping(value = "/tpTicketManageList/{loginName}",method = RequestMethod.GET)
+    public ResponseBean tpTicketManageList(@PathVariable(value = "loginName") String loginName,
+                                                @RequestParam(value = "status") Integer status,
+                                                @RequestParam(value = "communityId") Integer communityId,
+                                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean tpTicketManageList= socialServiceI.tpTicketManageList(loginName,status,pageNum,pageSize,communityId);
+        return tpTicketManageList;
+    }
+
+    @ApiOperation(value = "app端工单管理详情", notes = "app端工单管理列表详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "tickedID",value = "工单ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "电话号码"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "communityId",value = "小区")
+    })
+    @RequestMapping(value = "/tpTicketManage/{tickedID}",method = RequestMethod.GET)
+    public ResponseBean tpTicketManageDetails(@PathVariable(value = "tickedID") Integer tickedID,
+                                              @RequestParam(value = "communityId") Integer communityId,
+                                              @RequestParam(value = "loginName") String loginName) {
+        ResponseBean tpTicketManageDetails= socialServiceI.tpTicketManageDetails(tickedID,communityId,loginName);
+        return tpTicketManageDetails;
+    }
+
+    @ApiOperation(value = "app端工单管理回复业主", notes = "app端工单管理回复业主")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,content:对话内容，imageUrl:[]图片,ticketId:工单id，" +
+                    "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）")
+    })
+    @RequestMapping(value = "/tpTicketManage/reply",method = RequestMethod.POST)
+    public ResponseBean tpTicketManageReply(@RequestBody String parameter) {
+        ResponseBean tpTicketManageReply= socialServiceI.tpTicketManageReply(parameter);
+        return tpTicketManageReply;
+    }
+
+    @ApiOperation(value = "app端工单管理受理分配", notes = "app端工单管理受理分配")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,ticketId:工单id，" +
+                    "id:当前处理人id")
+    })
+    @RequestMapping(value = "/ticketManage/addRecord", method = RequestMethod.POST)
+    public ResponseBean ticketManageRecord(@RequestBody String parameter){
+        ResponseBean  responseBean = socialServiceI.ticketManageRecord(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app端工单管理拒绝处理", notes = "app端工单管理拒绝处理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,ticketId:工单id,textContent:拒绝的内容" )
+    })
+    @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
+    public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpSession session){
+        ResponseBean  responseBean = socialServiceI.updateTicketStatus(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "app端工单管理处理完成", notes = "app端工单管理处理完成")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName:手机号,communityId:小区,content:对话内容，imageUrl:[]图片,ticketId:工单id" )
+    })
+    @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
+    public ResponseBean updateTicket(@RequestBody String parameter){
+        ResponseBean  responseBean = socialServiceI.updateTicket(parameter);
+        return responseBean;
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TdImagesMapper.java

@@ -46,10 +46,11 @@ public interface TdImagesMapper {
     void deleteTdImages(@Param("uuid") Integer uuid, @Param("type") String type);
 
     /**
-     *
+     *查询图片
      * @param uuid
      * @param object
      * @return
      */
     List<TdImages> selectImages(@Param("uuid") Integer uuid, @Param("object") String object);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java

@@ -60,4 +60,10 @@ public interface TpMessageMapper {
      * @return
      */
     TpMessage selectBillinvoiceMessage(@Param("map") Map<String, Object> map);
+
+    /**
+     * 工单处理完成以后更新消状态
+     * @param ticketId
+     */
+    void updateTickMessageStatus(Integer ticketId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpShopAppraisalMapper.java

@@ -0,0 +1,45 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpShopAppraisal;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/7/2
+ **/
+@Mapper
+public interface TpShopAppraisalMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpShopAppraisal record);
+
+    int insertSelective(TpShopAppraisal record);
+
+    TpShopAppraisal selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpShopAppraisal record);
+
+    int updateByPrimaryKey(TpShopAppraisal record);
+
+    /**
+     * 查询当前业主评论信息
+     * @param shopID
+     * @return
+     */
+    List<TpShopAppraisal> shopEvaluateList(@Param("shopID") Integer shopID, @Param("communityId") Integer communityId);
+
+    /**
+     * 统计业主评论总数
+     * @param shopID
+     * @param communityId
+     * @return
+     */
+    int evaluateCount(@Param("shopID") Integer shopID, @Param("communityId") Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpShopAppraisalReplayMapper.java

@@ -0,0 +1,35 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpShopAppraisalReplay;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/7/2
+ **/
+@Mapper
+public interface TpShopAppraisalReplayMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpShopAppraisalReplay record);
+
+    int insertSelective(TpShopAppraisalReplay record);
+
+    TpShopAppraisalReplay selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpShopAppraisalReplay record);
+
+    int updateByPrimaryKey(TpShopAppraisalReplay record);
+
+    /**
+     * 查询当前商家回复有且只有一条
+     * @param id
+     * @param communityId
+     * @return
+     */
+    TpShopAppraisalReplay selectShopAppraisalReplay(Integer id, Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTicket;
+import com.community.huiju.vo.TpTicketVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -49,4 +50,19 @@ public interface TpTicketMapper {
     Integer selectRecordStatus(@Param("communityId") Integer communityId, @Param("ticketId")Integer ticketId);
 
     TpTicket selectTpTicketName(@Param("communityId")Integer communityId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
+
+    /**
+     * app端工单管理列表
+     * @param status
+     * @param communityId
+     * @return
+     */
+    List<TpTicket> ticketList(@Param("status") Integer status, @Param("communityId") Integer communityId);
+
+    /**
+     * 查询工单信息
+     * @param tickedID
+     * @return
+     */
+    TpTicketVO ticketDetails(Integer tickedID);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordCommentMapper.java

@@ -47,4 +47,7 @@ public interface TpTicketRecordCommentMapper {
      * @return
      */
     TpTicketRecordComment getUuID(@Param("communityId") Integer communityId, @Param("ticketId") Integer ticketId);
+
+    /*对话详情*/
+    List<TpTicketRecordComment> selectList(@Param("tickedID") Integer tickedID, @Param("recordId") Integer recordId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTicketRecord;
+import lombok.Data;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +27,13 @@ public interface TpTicketRecordMapper {
 	List<TpTicketRecord> getTicketRecordByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
 
     TpTicketRecord selectTpTicketRecord(@Param("ticketId") Integer ticketId, @Param("status") Integer status);
+
+    /**
+     * 查询当前工单流程
+     * @param tickedID
+     * @return
+     */
+    List<TpTicketRecord> selectListTicketStatus(@Param("tickedID") Integer tickedID);
+
+    String statusName(@Param("status") String status);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -1,5 +1,6 @@
 package com.community.huiju.dao;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +42,13 @@ public interface TpTransactionMapper {
      * @return
      */
     List<TpTransaction> getUserTransactionList(@Param("id") Integer id, @Param("communityId")Integer communityId);
+
+    /**
+     *app端话题管理帖子列表
+     * @param communityId
+     * @param status
+     * @param transactionTitle
+     * @return
+     */
+    List<TpTransaction> tpTransactionManageList(@Param("communityId") Integer communityId, @Param("ManageStatus") Integer status, @Param("transactionTitle") String transactionTitle);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReportMapper.java

@@ -1,9 +1,12 @@
 package com.community.huiju.dao;
 
+import com.community.huiju.model.TpTransactionReply;
 import com.community.huiju.model.TpTransactionReport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface TpTransactionReportMapper {
     int deleteByPrimaryKey(Integer id);
@@ -25,4 +28,24 @@ public interface TpTransactionReportMapper {
      * @return
      */
     TpTransactionReport selectByCommunityIdAndTransactionId(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
+
+    /**
+     * 统计帖子总数
+     * @param id
+     * @return
+     */
+    int selectCount(@Param("id") Integer id,@Param("communityId") Integer communityId);
+
+    /**
+     * 统计帖子举报列表
+     * @param id
+     * @return
+     */
+    List<TpTransactionReport> transactionReplyList(@Param("id")Integer id,@Param("communityId") Integer communityId);
+
+    /**
+     * app端话题管理清除不实举报
+     * @param tpTransactionReport
+     */
+    void deleteTransactionReport(@Param("tpTransactionReportID") Integer tpTransactionReport,@Param("communityId") Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpUserMapper.java

@@ -2,6 +2,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TpUserMapper {
@@ -16,4 +19,26 @@ public interface TpUserMapper {
     int updateByPrimaryKeySelective(TpUser record);
 
     int updateByPrimaryKey(TpUser record);
+
+    /**
+     * 当前用户在物业端的信息
+     * @param loginName
+     * @return
+     */
+    TpUser selectLoginName(@Param("loginName") String loginName,@Param("communityId") Integer communityId);
+
+    /**
+     *
+     * @param tpUserId
+     * @return
+     */
+    String selectByIdUserName(@Param("id") Integer tpUserId);
+
+    /**
+     *查询所有物业的人员，并排除自身
+     * @param id
+     * @param communityId
+     * @return
+     */
+    List<TpUser> getUser(@Param("id") Integer id, @Param("communityId") Integer communityId);
 }

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

@@ -0,0 +1,138 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpShopAppraisal {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer shopId;
+
+    private String score;
+
+    private String content;
+
+    private String appraisalPeople;
+
+    private String appraisalTel;
+
+    private String appraisalAvatar;
+
+    private Integer sort;
+
+    private String status;
+
+    private Integer createUser;
+
+    private Date createDate;
+    /**
+     * 当前回复信息有且只有一条商家回复
+     */
+    private TpShopAppraisalReplay tpShopAppraisalReplay;
+
+    public void setTpShopAppraisalReplay(TpShopAppraisalReplay tpShopAppraisalReplay) {
+        this.tpShopAppraisalReplay = tpShopAppraisalReplay;
+    }
+
+    public TpShopAppraisalReplay getTpShopAppraisalReplay() {
+        return tpShopAppraisalReplay;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getScore() {
+        return score;
+    }
+
+    public void setScore(String score) {
+        this.score = score == null ? null : score.trim();
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getAppraisalPeople() {
+        return appraisalPeople;
+    }
+
+    public void setAppraisalPeople(String appraisalPeople) {
+        this.appraisalPeople = appraisalPeople == null ? null : appraisalPeople.trim();
+    }
+
+    public String getAppraisalTel() {
+        return appraisalTel;
+    }
+
+    public void setAppraisalTel(String appraisalTel) {
+        this.appraisalTel = appraisalTel == null ? null : appraisalTel.trim();
+    }
+
+    public String getAppraisalAvatar() {
+        return appraisalAvatar;
+    }
+
+    public void setAppraisalAvatar(String appraisalAvatar) {
+        this.appraisalAvatar = appraisalAvatar == null ? null : appraisalAvatar.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+}

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

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpShopAppraisalReplay {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer shopAppraisalId;
+
+    private String replayContent;
+
+    private String replayPeople;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getShopAppraisalId() {
+        return shopAppraisalId;
+    }
+
+    public void setShopAppraisalId(Integer shopAppraisalId) {
+        this.shopAppraisalId = shopAppraisalId;
+    }
+
+    public String getReplayContent() {
+        return replayContent;
+    }
+
+    public void setReplayContent(String replayContent) {
+        this.replayContent = replayContent == null ? null : replayContent.trim();
+    }
+
+    public String getReplayPeople() {
+        return replayPeople;
+    }
+
+    public void setReplayPeople(String replayPeople) {
+        this.replayPeople = replayPeople == null ? null : replayPeople.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -1,8 +1,10 @@
 package com.community.huiju.model;
 
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
-
+@Data
 public class TpTicketRecord {
     private Integer id;
 
@@ -22,7 +24,16 @@ public class TpTicketRecord {
     private Integer createUser;
 
     private Date createDate;
-    
+    /**
+     * 对话详情列表
+     */
+    private  List<TpTicketRecordComment> statusContent;
+
+    /**
+     * 根据状态得到相应的步骤名称
+     */
+    private String statusName;
+
     private List<TpTicketRecordComment> ticketRecordCommentList;
 
     public Integer getId() {

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

@@ -81,6 +81,20 @@ public class TpTransaction {
      */
     private String sort;
 
+    /**
+     *是否已读
+     * @param releaseIdentity
+     */
+    private String readStatus;
+
+    public String getReadStatus() {
+        return readStatus;
+    }
+
+    public void setReadStatus(String readStatus) {
+        this.readStatus = readStatus;
+    }
+
     public void setReleaseIdentity(String releaseIdentity) {
         this.releaseIdentity = releaseIdentity;
     }
@@ -94,6 +108,34 @@ public class TpTransaction {
      */
     private String bel;
 
+    /**
+     * 举报总数
+     * @return
+     */
+    private int transactionReplyCount;
+
+    /**
+     * 举报列表
+     * @return
+     */
+    private List<TpTransactionReport> TpTransactionReport;
+
+    public List<com.community.huiju.model.TpTransactionReport> getTpTransactionReport() {
+        return TpTransactionReport;
+    }
+
+    public void setTpTransactionReport(List<com.community.huiju.model.TpTransactionReport> tpTransactionReport) {
+        TpTransactionReport = tpTransactionReport;
+    }
+
+    public int getTransactionReplyCount() {
+        return transactionReplyCount;
+    }
+
+    public void setTransactionReplyCount(int transactionReplyCount) {
+        this.transactionReplyCount = transactionReplyCount;
+    }
+
     public String getRoleName() {
         return roleName;
     }

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

@@ -16,6 +16,19 @@ public class TpTransactionReport {
 
     private Date createDate;
 
+    /**
+     * 举报内容
+     */
+    private String reportName;
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
     public Date getCreateDate() {
         return createDate;
     }

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

@@ -225,4 +225,88 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean replyAdd(String paramets, UserElement userElement);
+
+	/**
+	 * 个人中心话题管理列表
+	 * @param loginName
+	 * @param status
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+    ResponseBean tpTransactionManageList(String loginName, Integer status, Integer pageNum, Integer pageSize,String transactionTitle,Integer communityId);
+
+	/**
+	 * 人中心话题管批量作废
+	 * @param paramets
+	 * @return
+	 */
+    ResponseBean transactionsDelete(String paramets);
+
+	/**
+	 * app端话题管理清除不实举报
+	 * @param paramets
+	 * @return
+	 */
+	ResponseBean tpTransactionReportDelete(String paramets);
+
+	/**
+	 * app端话题管理添加话题
+	 * @param paramets
+	 * @return
+	 */
+    ResponseBean transactionsAdd(String paramets);
+
+	/**
+	 * app端话题管理批量已读话题
+	 * @param paramets
+	 * @return
+	 */
+	ResponseBean transactionsRead(String paramets);
+
+	/**
+	 * app端工单管理列表
+	 * @param loginName
+	 * @param status
+	 * @param pageNum
+	 * @param pageSize
+	 * @param communityId
+	 * @return
+	 */
+    ResponseBean tpTicketManageList(String loginName, Integer status, Integer pageNum, Integer pageSize, Integer communityId);
+
+	/**
+	 * app端工单管理详情
+	 * @param tickedID
+	 * @return
+	 */
+	ResponseBean tpTicketManageDetails(Integer tickedID,Integer communityId,String loginName);
+
+	/**
+	 * app端工单管理回复业主
+	 * @param parameter
+	 * @return
+	 */
+    ResponseBean tpTicketManageReply(String parameter);
+
+	/**
+	 * app端工单管理受理分配
+	 * @param parameter
+	 * @return
+	 */
+	ResponseBean ticketManageRecord(String parameter);
+
+	/**
+	 * app端工单管理拒绝处理
+	 * @param parameter
+	 * @return
+	 */
+	ResponseBean updateTicketStatus(String parameter);
+
+	/**
+	 * app端工单管理处理完成
+	 * @param parameter
+	 * @return
+	 */
+	ResponseBean updateTicket(String parameter);
 }

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

@@ -33,4 +33,19 @@ public interface TpShopServicel {
      * @return
      */
     ResponseBean getShopCommunity(UserElement userElement);
+
+    /**
+     * 查询当前商铺评价列表
+     * @param shopID
+     * @return
+     */
+    ResponseBean shopEvaluate(Integer shopID,UserElement userElement,Integer pageNum,Integer pageSize);
+
+    /**
+     * 添加线下商铺评论
+     * @param paramets
+     * @param userElement
+     * @return
+     */
+    ResponseBean shopEvaluateAdd(String paramets, UserElement userElement);
 }

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

@@ -10,6 +10,7 @@ import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.service.SocialServiceI;
+import com.community.huiju.vo.TpTicketVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
@@ -106,6 +107,12 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private ITaUserService iTaUserService;
 
+    @Autowired
+    private TpUserMapper tpUserMapperr;
+
+    @Autowired
+    private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
+
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
@@ -775,7 +782,6 @@ public class SocialServiceImpl implements SocialServiceI {
         return response;
     }
 
-
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分
@@ -1009,4 +1015,488 @@ public class SocialServiceImpl implements SocialServiceI {
         responseBean.addSuccess(replies);
         return responseBean;
     }
-}
+
+    @Override
+    public ResponseBean tpTransactionManageList(String loginName, Integer status, Integer pageNum, Integer pageSize,String transactionTitle,Integer communityId) {
+        ResponseBean responseBean= new  ResponseBean();
+        // 拿到当前用户在物业端的信息
+        TpUser tpUser= tpUserMapperr.selectLoginName(loginName,communityId);
+        if( null == tpUser ){
+            responseBean.addError("号码在物业端不存在");
+            return responseBean;
+        }
+        // 查出当前小区小下的所有帖子
+        Map<String, Object> parameter = Maps.newHashMap();
+        Page<TpTransaction> pageList = PageHelper.startPage(pageNum, pageSize);
+        List<TpTransaction> tpTransactionManageList= tpTransactionMapper.tpTransactionManageList(tpUser.getCommunityId(),status,transactionTitle);
+
+        for (TpTransaction tpTransaction:tpTransactionManageList){
+            // 统计举报整数
+            int transactionReplyCount= tpTransactionReportMapper.selectCount(tpTransaction.getId(),tpTransaction.getCommunityId());
+            tpTransaction.setTransactionReplyCount(transactionReplyCount);
+            // 统计举报列表
+            List<TpTransactionReport> transactionReplyList= tpTransactionReportMapper.transactionReplyList(tpTransaction.getId(),tpTransaction.getCommunityId());
+            tpTransaction.setTpTransactionReport(transactionReplyList);
+               // 发帖人身份
+            if (tpTransaction.getUuidType().equals("app")) {
+                TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getUserId());
+                tpTransaction.setTelephone(taUser.getLoginName());
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getRoleId());
+                tpTransaction.setRoleId(taSysRole.getId());
+                tpTransaction.setRoleName(taSysRole.getRoleName());
+            }
+            if (tpTransaction.getUuidType().equals("prop")) {
+                TpUser user = tpUserMapper.selectByPrimaryKey(tpTransaction.getUuid());
+                tpTransaction.setTelephone(user.getLoginName());
+                tpTransaction.setRoleName("物业");
+            }
+
+        }
+        parameter.put("list", tpTransactionManageList);
+        parameter.put("total", pageList.getTotal());
+        responseBean.addSuccess(parameter);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean transactionsDelete(String paramets) {
+        ResponseBean response = new ResponseBean();
+        JSONObject parseObject = JSONObject.parseObject(paramets);
+        // 根据电话号码查出物业端信息
+        String loginName = parseObject.getString("loginName");
+        Integer communityId = parseObject.getInteger("communityId");
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+
+        JSONArray tpTransactionIdId = parseObject.getJSONArray("id");
+        Integer[] tpTransactionIdArray = tpTransactionIdId.toArray(new Integer[]{});
+        for (Integer id : tpTransactionIdArray) {
+            TpTransaction tpTransaction = new TpTransaction();
+            tpTransaction.setId(id);
+            tpTransaction.setStatus("0");
+            tpTransaction.setUpdateDate(new Date());
+            tpTransaction.setUpdateUser(tpUser.getId());
+            tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean tpTransactionReportDelete(String paramets) {
+        ResponseBean response = new ResponseBean();
+        JSONObject parseObject = JSONObject.parseObject(paramets);
+        // 根据电话号码查出物业端信息
+        Integer communityId = parseObject.getInteger("communityId");
+        String loginName = parseObject.getString("loginName");
+        TpUser tpUser = tpUserMapper.selectLoginName(loginName,communityId);
+
+        JSONArray tpTransactionIdId = parseObject.getJSONArray("id");
+        Integer[] tpTransactionReportArray = tpTransactionIdId.toArray(new Integer[]{});
+        for (Integer TpTransactionReport:tpTransactionReportArray){
+            tpTransactionReportMapper.deleteTransactionReport(TpTransactionReport,tpUser.getCommunityId());
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean transactionsAdd(String paramets) {
+        JSONObject object= JSONObject.parseObject(paramets);
+        Integer communityId = object.getInteger("communityId");
+        String loginName =  object.getString("loginName");
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,Integer.valueOf(communityId));
+
+        Integer id = tpUser.getId();
+        ResponseBean response = new ResponseBean();
+
+        JSONObject jsonobject = JSONObject.parseObject(paramets);
+
+        TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
+        tpTransaction.setCommunityId(communityId);
+        tpTransaction.setUuid(id);
+        tpTransaction.setUuidType("prop");
+        tpTransaction.setUuidName(tpUser.getUserName());
+        tpTransaction.setCreateDate(new Date());
+        tpTransaction.setCreateUser(id);
+        tpTransaction.setViewCount(0);
+        tpTransaction.setIsReported("0");
+        tpTransaction.setReleaseIdentity("1");
+        tpTransactionMapper.insertSelective(tpTransaction);
+        JSONArray contentImg = jsonobject.getJSONArray("contentImg");
+
+        String[] contentImgArray = contentImg.toArray(new String[]{});
+        if (tpTransaction.getTransactionTitle() == null) {
+            response.addError("标题不能为空");
+            return response;
+        }
+        if (null == tpTransaction.getTransactionContent() && null == contentImg) {
+            response.addError("内容和图片必须填一个");
+            return response;
+        }
+        for (String img : contentImgArray) {
+            TdImages tdImages = new TdImages();
+            tdImages.setImageUrl(img);
+            tdImages.setType("transaction");
+            tdImages.setUuid(tpTransaction.getId());
+            tdImages.setCreateTime(new Date());
+            tdImages.setCreateUser(id);
+            tdImagesMapper.insert(tdImages);
+        }
+        return response;
+    }
+
+    @Override
+    public ResponseBean transactionsRead(String paramets) {
+        ResponseBean response = new ResponseBean();
+        JSONObject parseObject = JSONObject.parseObject(paramets);
+        // 根据电话号码查出物业端信息
+        String loginName = parseObject.getString("loginName");
+        Integer communityId = parseObject.getInteger("communityId");
+        TpUser tpUser = tpUserMapper.selectLoginName(loginName, communityId);
+
+        JSONArray tpTransactionIdId = parseObject.getJSONArray("id");
+        Integer[] tpTransactionIdArray = tpTransactionIdId.toArray(new Integer[]{});
+        for (Integer id : tpTransactionIdArray) {
+            TpTransaction tpTransaction = new TpTransaction();
+            tpTransaction.setId(id);
+            tpTransaction.setReadStatus("1");
+            tpTransaction.setUpdateDate(new Date());
+            tpTransaction.setUpdateUser(tpUser.getId());
+            tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean tpTicketManageList(String loginName, Integer status, Integer pageNum, Integer pageSize, Integer communityId) {
+        ResponseBean response = new ResponseBean<>();
+
+        TpUser tpUser = tpUserMapperr.selectLoginName(loginName, communityId);
+        Page<TpTransaction> pageList = PageHelper.startPage(pageNum, pageSize);
+        List<TpTicket> tpTicketList = tpTicketMapper.ticketList(status, tpUser.getCommunityId());
+        HashMap map = new HashMap<>();
+        map.put("list", tpTicketList);
+        map.put("total", pageList.getTotal());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean tpTicketManageDetails(Integer tickedID,Integer communityId,String loginName) {
+        // 获取物业端的用户信息
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+        ResponseBean response = new ResponseBean();
+        TpTicketVO ticketVO = tpTicketMapper.ticketDetails(tickedID);
+        // 从taUserVerify里面获取userID
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(ticketVO.getCreateUser());
+        TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+        /*发起人*/
+        ticketVO.setCreateUserNmae(taUser.getUserName());
+        /*发起人手机号码*/
+        ticketVO.setLoginName(taUser.getLoginName());
+        /*查询当前受理人*/
+        ticketVO.setTpUserNmae(tpUserMapper.selectByIdUserName(ticketVO.getTpUserId()));
+        /*查询所有物业的人员，并排除自身*/
+        ticketVO.setTpUsersList(tpUserMapper.getUser(tpUser.getId(), communityId));
+        /*本人*/
+        ticketVO.setCurrentUserName(tpUser.getId()+"");
+
+
+        /*查询工单类容的图片*/
+        List<TdImages> tdImages = tdImagesMapper.selectImages(tickedID,Constant.SERVICE);
+        List<String> contentImg = new ArrayList<String>();
+        for (TdImages images : tdImages) {
+            contentImg.add(images.getImageUrl());
+        }
+        ticketVO.setContentImageUrl(contentImg);
+
+        /*工单状态*/
+        List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.selectListTicketStatus(tickedID);
+        ticketVO.setRecordList(ticketRecordList);
+
+        for (TpTicketRecord ticketRecord : ticketRecordList) {
+            /*对话详情*/
+            List<TpTicketRecordComment> tpTicketRecordCommentList = tpTicketRecordCommentMapper.selectList(tickedID,ticketRecord.getId());
+            ticketRecord.setStatusContent(tpTicketRecordCommentList);
+            /* 遍历当前对话信息组装图片*/
+            for (TpTicketRecordComment tpTicketRecordComment : tpTicketRecordCommentList) {
+                /*注意reply用于标记工单回复类的图片*/
+                List<TdImages> ticketRecordCommentImages = tdImagesMapper.selectImages(tpTicketRecordComment.getId(),"reply");
+                tpTicketRecordComment.setImgURL(ticketRecordCommentImages);
+            }
+        }
+        /*根据状态得到相应的步骤名称*/
+        for (TpTicketRecord tpTicketRecord : ticketRecordList) {
+            String statusName = tpTicketRecordMapper.statusName(tpTicketRecord.getStatus());
+            tpTicketRecord.setStatusName(statusName);
+        }
+        response.addSuccess(ticketVO);
+        return response;
+    }
+
+    @Override
+    public ResponseBean tpTicketManageReply(String parameter) {
+        ResponseBean response=new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        String loginName = object.getString("loginName");
+        Integer communityId =  object.getInteger("communityId");
+        /*查询在物业端的信息*/
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+
+        String  content = object.getString("content");
+        Integer  ticketId = object.getInteger("ticketId");
+        Integer  status = object.getInteger("status");
+
+        /*根据工单Id和状态查出工单记录ID*/
+        TpTicket  tpTicket= tpTicketMapper.selectByPrimaryKey(ticketId);
+        TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(ticketId, Integer.valueOf(tpTicket.getStatus()));
+        TpTicketRecordComment tpTicketRecordComment= new TpTicketRecordComment();
+        tpTicketRecordComment.setCommunityId(communityId);
+        tpTicketRecordComment.setContent(content);
+        tpTicketRecordComment.setTicketId(ticketId);
+        tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
+        tpTicketRecordComment.setUuid(tpUser.getId());
+        tpTicketRecordComment.setUserType("0");
+        tpTicketRecordComment.setUserName(tpUser.getUserName());
+        tpTicketRecordComment.setCreateDate(new Date());
+        tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
+        JSONArray contentImg = object.getJSONArray("imageUrl");
+        if (null!=contentImg){
+            String[] contentImgArray = contentImg.toArray(new String[]{});
+
+            for (String img : contentImgArray) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                /*注意reply用于标记工单回复类的图片*/
+                tdImages.setType("reply");
+                tdImages.setUuid(tpTicketRecordComment.getId());
+                tdImages.setCreateTime(new Date());
+                tdImages.setCreateUser(tpUser.getId());
+                tdImagesMapper.insert(tdImages);
+            }
+        }
+        //1.5维护工单对话推送到app消息
+        TpMessage message = new TpMessage();
+        message.setCommunityId(communityId);
+        message.setMessageType(tpTicket.getType());
+        message.setTicketId(tpTicket.getId());
+        message.setAdviceType("1");
+        message.setUuid(tpTicket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("物业回复您:"+content);
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(tpTicket.getCreateUser());
+        message.setCreateDate(new Date());
+        message.setTicketId(ticketId);
+        response.addSuccess("成功");
+        tpMessageMapper.insert(message);
+        return response;
+    }
+
+    @Override
+    public ResponseBean ticketManageRecord(String parameter) {
+        ResponseBean response=new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        String loginName = object.getString("loginName");
+        Integer communityId =  object.getInteger("communityId");
+        Integer  ticketId = object.getInteger("ticketId");
+        /*当前处理人ID */
+        String  status = object.getString("status");
+        Integer  userID = object.getInteger("id");
+        /*查询在物业端的信息*/
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+
+        /**注意，这是受理人信息，不是当前用户信息*/
+        TpUser userName= tpUserMapper.selectByPrimaryKey(userID);
+        TpTicket tpTicket= new TpTicket();
+        tpTicket.setId(ticketId);
+        tpTicket.setStatus("3");
+        tpTicket.setTpUserId(userID);
+        tpTicket.setUpdateDate(new Date());
+        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+
+        TpTicketRecord tpTicketRecord= new TpTicketRecord();
+        tpTicketRecord.setCommunityId(communityId);
+        tpTicketRecord.setTicketId(ticketId);
+        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
+        tpTicketRecord.setStatus("3");
+        tpTicketRecord.setCreateUser(tpUser.getId());
+        tpTicketRecord.setCreateDate(new Date());
+        tpTicketRecordMapper.insert(tpTicketRecord);
+
+        //待办模板
+        TpTicket ticket = tpTicketMapper.getTicketTpUserId(ticketId,communityId);
+        TpMessage message = new TpMessage();
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("4");
+        message.setUuid(userID);
+        message.setModelType("2");
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(tpUser.getId());
+        message.setCreateDate(new Date());
+        message.setTicketId(ticketId);
+        tpMessageMapper.insert(message);
+        //如果分配给本人维护消息模板
+        if (null!=userID&userID.equals(tpUser.getId())){
+            message.setModelType("1");
+            tpMessageMapper.insert(message);
+        }
+        //分配成功后推送app
+        message.setUuidType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+userName.getUserName());
+        message.setAdviceType("1");
+        tpMessageMapper.insert(message);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean updateTicketStatus(String parameter) {
+        /*拒绝处理仅在待分配的情况下修改，由前台控制拒绝处理的按钮是否显示*/
+        ResponseBean response = new ResponseBean();
+        JSONObject object = JSONObject.parseObject(parameter);
+        String loginName = object.getString("loginName");
+        Integer communityId =  object.getInteger("communityId");
+        /**查询当前app用户在物业端的信息**/
+        TpUser tpUser =  tpUserMapper.selectLoginName(loginName,communityId);
+
+        Integer ticketId = object.getInteger("ticketId");
+        String textContent = object.getString("textContent");
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setId(ticketId);
+        tpTicket.setStatus("1");
+        tpTicket.setUpdateUser(tpUser.getId());
+        tpTicket.setUpdateDate(new Date());
+        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+        /*查询当前处理人的名字*/
+
+        TpTicketRecord tpTicketRecord = new TpTicketRecord();
+        tpTicketRecord.setTicketId(ticketId);
+        tpTicketRecord.setContent("您的报修被物业人员" + tpUser.getUserName() + "拒绝接受理，原因:" + textContent + ",有问题可以联系" + tpUser.getUserName() + ":联系方式:" + tpUser.getLoginName());
+        tpTicketRecord.setCommunityId(communityId);
+        tpTicketRecord.setStatus("1");
+        tpTicketRecord.setCreateUser(tpUser.getId());
+        tpTicketRecord.setCreateDate(new Date());
+        tpTicketRecordMapper.insert(tpTicketRecord);
+        /*把内容添加到对话中*/
+        TpTicketRecordComment ticketRecordComment = new TpTicketRecordComment();
+        ticketRecordComment.setCommunityId(communityId);
+        ticketRecordComment.setTicketId(ticketId);
+        ticketRecordComment.setTicketRecordId(tpTicketRecord.getId());
+        ticketRecordComment.setUuid(tpUser.getId());
+        ticketRecordComment.setUserType("0");
+        ticketRecordComment.setContent("拒绝受理，原因——" + textContent);
+        ticketRecordComment.setUserName(tpUser.getUserName());
+        ticketRecordComment.setCreateDate(new Date());
+        tpTicketRecordCommentMapper.insert(ticketRecordComment);
+
+        //维护1.5版本
+        TpMessage message = new TpMessage();
+        TpTicket ticket = tpTicketMapper.getTicketTpUserId(ticketId,communityId);
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已被拒绝受理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(tpUser.getId());
+        message.setCreateDate(new Date());
+        message.setTicketId(ticketId);
+        tpMessageMapper.insert(message);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean updateTicket(String parameter) {
+        ResponseBean response=new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        String loginName = object.getString("loginName");
+        Integer communityId =  object.getInteger("communityId");
+        /**查询当前app用户在物业端的信息**/
+        TpUser tpUser =  tpUserMapper.selectLoginName(loginName,communityId);
+
+        String  content = object.getString("content");
+        Integer  ticketId = object.getInteger("ticketId");
+        TpTicket tpTicket= new TpTicket();
+        tpTicket.setId(ticketId);
+        tpTicket.setStatus("4");
+        tpTicket.setUpdateDate(new Date());
+        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+        /**维护工单处理表**/
+        TpTicketRecord tpTicketRecord = new TpTicketRecord();
+        tpTicketRecord.setCommunityId(communityId);
+        tpTicketRecord.setTicketId(ticketId);
+        TpTicket tpTicketUserID= tpTicketMapper.selectByPrimaryKey(ticketId);
+        tpTicketRecord.setContent("物业工作人员"+tpUser.getUserName()+"已经处理结束,如果没有问题请给好评,联系方式:"+tpUser.getLoginName());
+        tpTicketRecord.setStatus("4");
+        tpTicketRecord.setCreateUser(tpUser.getId());
+        tpTicketRecord.setCreateDate(new Date());
+        tpTicketRecordMapper.insert(tpTicketRecord);
+        /*维护对话*/
+        TpTicketRecordComment tpTicketRecordComment= new TpTicketRecordComment();
+        tpTicketRecordComment.setCommunityId(communityId);
+        tpTicketRecordComment.setTicketId(ticketId);
+        tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
+        tpTicketRecordComment.setUuid(tpUser.getId());
+        tpTicketRecordComment.setUserType("0");
+        tpTicketRecordComment.setContent("处理结果如下____"+content);
+        tpTicketRecordComment.setUserName(tpUser.getUserName());
+        tpTicketRecordComment.setCreateDate(new Date());
+        tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
+        /* 传入图片*/
+        JSONArray contentImg = object.getJSONArray("imageUrl");
+        if (null!=contentImg){
+            String[] contentImgArray = contentImg.toArray(new String[]{});
+            for (String img : contentImgArray) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                /*注意reply用于标记工单回复类的图片*/
+                tdImages.setType(Constant.REPLY);
+                tdImages.setUuid(tpTicketRecordComment.getId());
+                tdImages.setCreateTime(new Date());
+                tdImages.setCreateUser(tpUser.getId());
+                tdImagesMapper.insert(tdImages);
+            }
+        }
+        //分配成功后这只messgae消息表status为无效
+        tpMessageMapper.updateTickMessageStatus(ticketId);
+
+        // 处理完成后推送app
+        TpTicket ticket = tpTicketMapper.getTicketTpUserId(ticketId,tpUser.getCommunityId());
+        TpMessage message= new TpMessage();
+        message.setCommunityId(tpUser.getCommunityId());
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent("您的工单“" + ticket.getTicketTitle() + "”已处理完成，请查看详情");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(tpUser.getId());
+        message.setCreateDate(new Date());
+        message.setTicketId(ticketId);
+        tpMessageMapper.insert(message);
+        response.addSuccess("成功");
+        return response;
+    }
+}

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

@@ -1,14 +1,10 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TpShopImgMapper;
-import com.community.huiju.dao.TpShopMapper;
-import com.community.huiju.dao.TpShopTypeMapper;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpShop;
-import com.community.huiju.model.TpShopImg;
-import com.community.huiju.model.TpShopType;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TpShopServicel;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -16,10 +12,7 @@ import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * version V1.0
@@ -39,6 +32,18 @@ public class TpShopServicelmpl implements TpShopServicel {
 
     @Autowired
     private TpShopImgMapper tpShopImgMapper;
+
+    @Autowired
+    private TpShopAppraisalMapper tpShopAppraisalMapper;
+
+    @Autowired
+    private TpShopAppraisalReplayMapper tpShopAppraisalReplayMapper;
+
+    @Autowired
+    private  TaUserMapper taUserMapper;
+
+    @Autowired
+    private  TaUserVerifyMapper taUserVerifyMapper;
     @Override
     public ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId,Integer pageNum,Integer pageSize) {
         ResponseBean responseBean= new ResponseBean<>();
@@ -145,4 +150,42 @@ public class TpShopServicelmpl implements TpShopServicel {
         return response;
 
     }
+
+    @Override
+    public ResponseBean shopEvaluate(Integer shopID,UserElement userElement,Integer pageNum,Integer pageSize) {
+        ResponseBean responseBean= new ResponseBean();
+        Map<String, Object> parameter = Maps.newHashMap();
+        Page<TpShopAppraisal> pagetpShopAppraisal = PageHelper.startPage(pageNum, pageSize);
+        List<TpShopAppraisal> tpShopAppraisalList= tpShopAppraisalMapper.shopEvaluateList(Integer.valueOf(shopID),userElement.getCommunityId());
+        for (TpShopAppraisal tpShopAppraisal:tpShopAppraisalList){
+            // 查商家回复，有且只有一条
+            TpShopAppraisalReplay tpShopAppraisalReplay = tpShopAppraisalReplayMapper.selectShopAppraisalReplay(tpShopAppraisal.getId(),userElement.getCommunityId());
+            tpShopAppraisal.setTpShopAppraisalReplay(tpShopAppraisalReplay);
+        }
+        int evaluateCount= tpShopAppraisalMapper.evaluateCount(Integer.valueOf(shopID),userElement.getCommunityId());
+        parameter.put("total", pagetpShopAppraisal.getTotal());
+        parameter.put("list", pagetpShopAppraisal);
+        parameter.put("evaluate", evaluateCount);
+        responseBean.addSuccess(parameter);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean shopEvaluateAdd(String paramets, UserElement userElement) {
+        ResponseBean responseBean= new ResponseBean();
+        TpShopAppraisal tpShopAppraisal= JSONObject.parseObject(paramets,TpShopAppraisal.class);
+
+        tpShopAppraisal.setCommunityId(userElement.getCommunityId());
+        tpShopAppraisal.setAppraisalPeople(userElement.getId()+"");
+        tpShopAppraisal.setAppraisalTel(userElement.getLoginName());
+        String photo = taUserMapper.selectByPrimaryKey(userElement.getId()).getHeadPortrait();
+        tpShopAppraisal.setAppraisalAvatar(photo);
+        tpShopAppraisal.setScore("1");
+        tpShopAppraisal.setStatus("1");
+        tpShopAppraisal.setCreateUser(userElement.getUserVerifyId());
+        tpShopAppraisal.setCreateDate(new Date());
+        responseBean.addSuccess("成功");
+        tpShopAppraisalMapper.insert(tpShopAppraisal);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -1,9 +1,13 @@
 package com.community.huiju.vo;
 
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTicketRecord;
+import com.community.huiju.model.TpUser;
 import com.community.huiju.model.TpannouncementTel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import sun.security.krb5.internal.Ticket;
 
 import java.util.Date;
 import java.util.List;
@@ -16,7 +20,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class TpTicketVO {
+public class TpTicketVO extends TpTicket {
 
     /** 编号 **/
     private Integer id;
@@ -77,4 +81,39 @@ public class TpTicketVO {
 
     /**投诉流程状态**/
     private String statusList;
+
+    /**
+     * 工单发起人
+     */
+    private String createUserNmae;
+
+    /**
+     * 发起人手机号码
+     */
+    private String loginName;
+
+    /**
+     * 当前受理人
+     */
+    private String tpUserNmae;
+
+    /**
+     * 物业端所有小区人员
+     */
+    private List<TpUser> tpUsersList;
+
+    /**
+     * 本人
+     */
+    private  String currentUserName;
+
+    /**
+     * 工单内容图片
+     */
+    private  List<String> contentImageUrl;
+
+    /**
+     * 工单流程
+     */
+    private List<TpTicketRecord> recordList;
 }

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

@@ -446,4 +446,15 @@
     and advice_type = 1
     and source = 2
   </select>
+
+  <update id="updateTickMessageStatus" >
+        update tp_message
+        set
+            status = 0
+        where
+        ticket_id = #{ticketId,jdbcType=INTEGER}
+        and model_type=2
+        order by create_date ASC
+        LIMIT 1
+    </update>
 </mapper>

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

@@ -0,0 +1,189 @@
+<?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.TpShopAppraisalMapper">
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpShopAppraisal">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="community_id" jdbcType="INTEGER" property="communityId" />
+    <result column="shop_id" jdbcType="INTEGER" property="shopId" />
+    <result column="score" jdbcType="VARCHAR" property="score" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="appraisal_people" jdbcType="VARCHAR" property="appraisalPeople" />
+    <result column="appraisal_tel" jdbcType="VARCHAR" property="appraisalTel" />
+    <result column="appraisal_avatar" jdbcType="VARCHAR" property="appraisalAvatar" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="create_user" jdbcType="INTEGER" property="createUser" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, community_id, shop_id, score, content, appraisal_people, appraisal_tel, appraisal_avatar, 
+    sort, status, create_user, create_date
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tp_shop_appraisal
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tp_shop_appraisal
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpShopAppraisal">
+    insert into tp_shop_appraisal (id, community_id, shop_id, 
+      score, content, appraisal_people, 
+      appraisal_tel, appraisal_avatar, sort, 
+      status, create_user, create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, 
+      #{score,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{appraisalPeople,jdbcType=VARCHAR}, 
+      #{appraisalTel,jdbcType=VARCHAR}, #{appraisalAvatar,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{status,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpShopAppraisal">
+    insert into tp_shop_appraisal
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="communityId != null">
+        community_id,
+      </if>
+      <if test="shopId != null">
+        shop_id,
+      </if>
+      <if test="score != null">
+        score,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="appraisalPeople != null">
+        appraisal_people,
+      </if>
+      <if test="appraisalTel != null">
+        appraisal_tel,
+      </if>
+      <if test="appraisalAvatar != null">
+        appraisal_avatar,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null">
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="shopId != null">
+        #{shopId,jdbcType=INTEGER},
+      </if>
+      <if test="score != null">
+        #{score,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="appraisalPeople != null">
+        #{appraisalPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="appraisalTel != null">
+        #{appraisalTel,jdbcType=VARCHAR},
+      </if>
+      <if test="appraisalAvatar != null">
+        #{appraisalAvatar,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpShopAppraisal">
+    update tp_shop_appraisal
+    <set>
+      <if test="communityId != null">
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="shopId != null">
+        shop_id = #{shopId,jdbcType=INTEGER},
+      </if>
+      <if test="score != null">
+        score = #{score,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="appraisalPeople != null">
+        appraisal_people = #{appraisalPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="appraisalTel != null">
+        appraisal_tel = #{appraisalTel,jdbcType=VARCHAR},
+      </if>
+      <if test="appraisalAvatar != null">
+        appraisal_avatar = #{appraisalAvatar,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpShopAppraisal">
+    update tp_shop_appraisal
+    set community_id = #{communityId,jdbcType=INTEGER},
+      shop_id = #{shopId,jdbcType=INTEGER},
+      score = #{score,jdbcType=VARCHAR},
+      content = #{content,jdbcType=VARCHAR},
+      appraisal_people = #{appraisalPeople,jdbcType=VARCHAR},
+      appraisal_tel = #{appraisalTel,jdbcType=VARCHAR},
+      appraisal_avatar = #{appraisalAvatar,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      status = #{status,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <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>
+
+  <select id="evaluateCount" resultType="int">
+    select
+    count(id)
+    from tp_shop_appraisal where shop_id = #{shopID,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER} and status = 1
+  </select>
+</mapper>

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

@@ -0,0 +1,145 @@
+<?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.TpShopAppraisalReplayMapper">
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpShopAppraisalReplay">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="community_id" jdbcType="INTEGER" property="communityId" />
+    <result column="shop_appraisal_id" jdbcType="INTEGER" property="shopAppraisalId" />
+    <result column="replay_content" jdbcType="VARCHAR" property="replayContent" />
+    <result column="replay_people" jdbcType="VARCHAR" property="replayPeople" />
+    <result column="create_user" jdbcType="INTEGER" property="createUser" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_user" jdbcType="INTEGER" property="updateUser" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, community_id, shop_appraisal_id, replay_content, replay_people, create_user, 
+    create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tp_shop_appraisal_replay
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tp_shop_appraisal_replay
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpShopAppraisalReplay">
+    insert into tp_shop_appraisal_replay (id, community_id, shop_appraisal_id, 
+      replay_content, replay_people, create_user, 
+      create_date, update_user, update_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{shopAppraisalId,jdbcType=INTEGER}, 
+      #{replayContent,jdbcType=VARCHAR}, #{replayPeople,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpShopAppraisalReplay">
+    insert into tp_shop_appraisal_replay
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="communityId != null">
+        community_id,
+      </if>
+      <if test="shopAppraisalId != null">
+        shop_appraisal_id,
+      </if>
+      <if test="replayContent != null">
+        replay_content,
+      </if>
+      <if test="replayPeople != null">
+        replay_people,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
+      <if test="updateDate != null">
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null">
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="shopAppraisalId != null">
+        #{shopAppraisalId,jdbcType=INTEGER},
+      </if>
+      <if test="replayContent != null">
+        #{replayContent,jdbcType=VARCHAR},
+      </if>
+      <if test="replayPeople != null">
+        #{replayPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null">
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpShopAppraisalReplay">
+    update tp_shop_appraisal_replay
+    <set>
+      <if test="communityId != null">
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="shopAppraisalId != null">
+        shop_appraisal_id = #{shopAppraisalId,jdbcType=INTEGER},
+      </if>
+      <if test="replayContent != null">
+        replay_content = #{replayContent,jdbcType=VARCHAR},
+      </if>
+      <if test="replayPeople != null">
+        replay_people = #{replayPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null">
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpShopAppraisalReplay">
+    update tp_shop_appraisal_replay
+    set community_id = #{communityId,jdbcType=INTEGER},
+      shop_appraisal_id = #{shopAppraisalId,jdbcType=INTEGER},
+      replay_content = #{replayContent,jdbcType=VARCHAR},
+      replay_people = #{replayPeople,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectShopAppraisalReplay" resultMap="BaseResultMap">
+    select * from tp_shop_appraisal_replay WHERE community_id = #{communityId,jdbcType=INTEGER} and shop_appraisal_id = #{id,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -276,4 +276,55 @@
      and ticket_title= #{ticketTitle,jdbcType=INTEGER}
      and type = #{type,jdbcType=VARCHAR}
   </select>
+
+  <select id="ticketList" resultMap="BaseResultMap">
+    select
+    id,
+    community_id,
+    ta_user_id,
+    ticket_title,
+    ticket_content,
+    STATUS,
+    repair_type,
+    tp_user_id,
+    score,
+    COMMENT,
+    create_user,
+    create_date,
+    update_user,
+    update_date,
+    (CASE type WHEN 1 THEN '投诉' WHEN 2 THEN '报修' WHEN 3 THEN '联系物业' ELSE	'未知' END) as type
+    from tp_ticket
+    <where>
+      <if test="status == 0 or status == 3 ">
+            status = #{status}
+      </if>
+      <if test="status == 9 ">
+        and  `status` NOT in(0,3)
+      </if>
+      and community_id = #{communityId,jdbcType=INTEGER}
+    </where>
+  </select>
+
+  <select id="ticketDetails" resultType="com.community.huiju.vo.TpTicketVO">
+        SELECT
+        p.id as id,
+        p.community_id as communityId,
+        p.ta_user_id as taUserId,
+        p.ticket_title as  ticketTitle,
+        p.ticket_content as ticketContent,
+        p.STATUS as STATUS,
+        p.type,
+        p.repair_type as repairType,
+        p.tp_user_id as tpUserId,
+        p.score,
+        p.COMMENT,
+        p.create_user as createUser,
+        p.create_date as createDate,
+        p.update_user as updateUser,
+        p.update_date as updateDate
+        FROM
+        tp_ticket p
+        WHERE p.id=#{id,jdbcType=INTEGER}
+    </select>
 </mapper>

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

@@ -180,4 +180,8 @@
 	create_date DESC
     LIMIT 1
   </select>
+  <select id="selectList" resultMap="BaseResultMap">
+    select * from  tp_ticket_record_comment WHERE ticket_id =#{tickedID} and ticket_record_id = #{recordId}  ;
+  </select>
+
 </mapper>

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

@@ -141,4 +141,17 @@
     WHERE ticket_id = #{ticketId,jdbcType=INTEGER}
           and status = #{status,jdbcType=INTEGER}
 </select>
+
+  <select id="selectListTicketStatus" resultMap="BaseResultMap">
+    select * from tp_ticket_record
+    where ticket_id = #{tickedID,jdbcType=INTEGER}
+  </select>
+
+  <select id="statusName" resultType="string">
+        SELECT
+       name
+        FROM sys_dictionary
+        WHERE code= #{status,jdbcType=INTEGER}
+          and group_id = 1
+    </select>
 </mapper>

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

@@ -10,6 +10,7 @@
         <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR"/>
         <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR"/>
         <result column="sort" property="sort" jdbcType="VARCHAR"/>
+        <result column="read_status" property="readStatus" jdbcType="VARCHAR"/>
         <result column="view_count" property="viewCount" jdbcType="INTEGER"/>
         <result column="status" property="status" jdbcType="CHAR"/>
         <result column="type" property="type" jdbcType="CHAR"/>
@@ -25,7 +26,7 @@
     </resultMap>
     <sql id="Base_Column_List">
     id, community_id, transaction_title, transaction_content, sort,uuid,uuid_type,uuid_name,
-    view_count, status, type, create_user, create_date, update_user, update_date, release_identity,room_no_name
+    view_count, status, type, create_user, create_date, update_user, update_date, release_identity,room_no_name,read_status
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
     select
@@ -45,12 +46,12 @@
       sort,
       view_count, status,
       type, create_user, create_date, 
-      update_user, update_date,room_no_name)
+      update_user, update_date,room_no_name,read_status)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{releaseIdentity,jdbcType=VARCHAR},#{taUserVerifyId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
       #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
        #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR},
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},#{roomNoName,jdbcType=VARCHAR})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},#{roomNoName,jdbcType=VARCHAR},#{readStatus,jdbcType=VARCHAR})
   </insert>
     <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.community.huiju.model.TpTransaction">
@@ -110,6 +111,10 @@
             <if test="roomNoName != null">
                 room_no_name
             </if>
+            <if test="readStatus != null">
+                read_status
+            </if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -166,6 +171,10 @@
             <if test="roomNoName != null">
                 #{roomNoName,jdbcType=VARCHAR}
             </if>
+            <if test="readStatus != null">
+                #{readStatus,jdbcType=VARCHAR}
+            </if>
+
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction">
@@ -210,6 +219,9 @@
             <if test="roomNoName != null">
                 room_no_name = #{roomNoName,jdbcType=VARCHAR},
             </if>
+            <if test="readStatus != null">
+                read_status = #{readStatus,jdbcType=VARCHAR},
+            </if>
 
         </set>
         where id = #{id,jdbcType=INTEGER}
@@ -229,6 +241,7 @@
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
       room_no_name = #{roomNoName,jdbcType=VARCHAR}
+      read_status = #{readStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -317,4 +330,28 @@
         ORDER BY
         create_date DESC
     </select>
+
+    <select id="tpTransactionManageList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM tp_transaction
+        <where>
+            <if test="transactionTitle != null and transactionTitle !=''">
+                transaction_title like concat('%',#{ transactionTitle,jdbcType=VARCHAR},'%')
+            </if>
+
+            <if test="ManageStatus == 1">
+                and is_reported = 1
+            </if>
+            <if test="ManageStatus == 2">
+                (read_status IS NULL or read_status = 2)
+            </if>
+            <if test="ManageStatus == 3">
+                and  read_status= 1
+            </if>
+            and community_id=#{communityId,jdbcType=INTEGER}
+            and status = 1
+        </where>
+
+    </select>
 </mapper>

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

@@ -7,6 +7,7 @@
     <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
     <result column="report_reason_id" property="reportReasonId" jdbcType="VARCHAR" />
     <result column="reporter_id" property="reporterId" jdbcType="INTEGER" />
+    <result column="reportName" property="reportName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, transaction_id, report_reason_id, reporter_id
@@ -100,4 +101,29 @@
       and community_id = #{communityId,jdbcType=INTEGER}
       and transaction_id = #{transactionId,jdbcType=INTEGER}
   </select>
+
+  <select id="selectCount" resultType="int">
+    SELECT COUNT(id) from tp_transaction_report
+    WHERE transaction_id = #{id}
+    and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+
+  <select id="transactionReplyList" resultMap="BaseResultMap">
+    SELECT
+    tr.id,
+	tr.community_id,
+	tr.transaction_id,
+	tr.report_reason_id,
+	tr.reporter_id,
+	rr.reason as reportName
+	from tp_transaction_report tr
+    left join sys_report_reason rr on tr.report_reason_id = rr.id
+    WHERE tr.transaction_id = #{id}
+    and tr.community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+
+  <select id="deleteTransactionReport" parameterType="java.lang.Integer">
+    delete from tp_transaction_report
+    where transaction_id = #{tpTransactionReportID,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -185,4 +185,32 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectLoginName" resultMap="BaseResultMap">
+    select * from tp_user WHERE login_name = #{loginName,jdbcType=VARCHAR} and community_id = #{communityId}
+  </select>
+
+  <select id="selectByIdUserName" parameterType="int" resultType="string">
+        SELECT
+         user_name
+        FROM
+        tp_user
+        WHERE id=#{id,jdbcType=INTEGER}
+    </select>
+
+  <select id="getUser" resultType="com.community.huiju.model.TpUser">
+        SELECT
+        tu.create_user,
+        tu.create_date,
+        tu.update_date,
+        tu.user_name,
+        tu.remark,
+        tu.login_name,
+        tu.status,
+        tu.id
+        FROM
+         tp_user tu
+        WHERE   tu.community_id=#{communityId,jdbcType=INTEGER}
+        and tu.id!=#{id,jdbcType=INTEGER}
+    </select>
 </mapper>