合并本地分支

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

@@ -70,4 +70,13 @@ public class MessageController {
 		responseBean.addSuccess(upcomingList);
 		return responseBean;
 	}
+
+	@ApiOperation(value = "消息已读接口", notes = "消息已读接口")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id")})
+	@RequestMapping(value = "/readStatus/{communityId}",method = RequestMethod.POST)
+	public ResponseBean allMessageRead(@PathVariable("communityId") Integer communityId){
+		ResponseBean responseBean = new ResponseBean();
+		messageService.updateMessageReadStatus(communityId);
+		return responseBean;
+	}
 }

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

@@ -2,9 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpMessage;
+import com.community.huiju.model.*;
 import com.community.huiju.service.SocialServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -41,11 +39,12 @@ public class SocialController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/sign", method = RequestMethod.GET)
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "communityId", value = "小区Id") })
-    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId){
-        ResponseBean responseBean = new ResponseBean();
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+                         @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id")})
+    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId")Integer activityId){
+        ResponseBean responseBean = socialServiceI.findTaUserInfo(activityId, communityId);
         return responseBean;
     }
     
@@ -103,4 +102,27 @@ public class SocialController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/getAllTransaction/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAllPosts(@PathVariable("communityId")Integer communityId, @RequestParam("type") String type,
+                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpTransaction> tpTransactions = socialServiceI.findAllTransaction(communityId, type, pageNum, pageSize);
+        responseBean.addSuccess(tpTransactions);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id")})
+    @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
+    public ResponseBean stopTicket(@PathVariable("communityId")Integer communityId, @RequestParam("ticketId")Integer ticketId){
+        ResponseBean responseBean = socialServiceI.stopTpTicketRecord(communityId, ticketId);
+        return responseBean;
+    }
 }

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

@@ -16,6 +16,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 @RestController
 @RefreshScope
@@ -48,7 +49,20 @@ public class TicketController {
         response = iTicketService.getList(tpTicket,pageNum,pageSize);
         return response;
     }
-
+    
+    @ApiOperation(value = "获取报修详情数据",notes = "获取报修详情数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "ticketId",value = "报修id")
+    })
+    @RequestMapping(value = "/ticket/schedule/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") String communityId,@RequestParam Integer ticketId){
+        ResponseBean responseBean = new ResponseBean();
+        TpTicket ticket = iTicketService.getTicketSchedule(communityId,ticketId);
+        responseBean.addSuccess(ticket);
+        return responseBean;
+    }
+    
     @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
     @ApiImplicitParams({
@@ -77,20 +91,4 @@ public class TicketController {
 
     }
 
-
-    @RequestMapping(value = "/tickets/info/{ticketId}", method = RequestMethod.GET)
-    @ApiOperation(value = "获取 报修/投诉/联系单 数据详情", notes = "根据 工单ID")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "ticketId", value = "小区编号"),
-    })
-    public ResponseBean getServicesInfo(@PathVariable(value = "ticketId") Integer ticketId,
-                                       HttpSession session) {
-        ResponseBean responseBean = new ResponseBean();
-
-        responseBean = iTicketService.getById(ticketId);
-
-        return responseBean;
-
-    }
-
 }

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

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaSysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaSysRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysRole record);
+
+    int insertSelective(TaSysRole record);
+
+    TaSysRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysRole record);
+
+    int updateByPrimaryKey(TaSysRole record);
+
+    TaSysRole findRoleByUserId(Integer userId);
+}

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

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaSysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaSysUserRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysUserRole record);
+
+    int insertSelective(TaSysUserRole record);
+
+    TaSysUserRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysUserRole record);
+
+    int updateByPrimaryKey(TaSysUserRole record);
+
+    Integer findSysUserRoleByUserIdAndRoleId(Integer userId);
+}

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

@@ -9,13 +9,14 @@ import java.util.List;
 
 @Mapper
 public interface TpActivityMapper {
+
     int deleteByPrimaryKey(Integer id);
 
     int insert(TpActivity record);
 
     int insertSelective(TpActivity record);
 
-    TpActivity selectByPrimaryKey(@Param("id") Integer id,@Param("communityId") Integer communityId);
+    TpActivity selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
 
     int updateByPrimaryKeySelective(TpActivity record);
 

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

@@ -24,4 +24,6 @@ public interface TpMessageMapper {
     Map<String, Object> getMessageTotal(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId);
     
     List<TpMessage> getMessages(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId, @Param(value = "modelType") Integer modelType);
+
+    void updateReadStatus(Integer communityId);
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTicket;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -26,4 +27,12 @@ public interface TpTicketMapper {
      * @return
      */
     List<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Map map);
+    
+    /**
+     * 获取报修进度
+     * @param communityId
+     * @param ticketId
+     * @return
+     */
+	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.dao;
 
+import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,4 +31,11 @@ public interface TpTicketRecordCommentMapper {
      * @return
      */
     List<TpTicketRecordComment> selectByTicketId(Map map);
+    
+    /**
+     * 查询出这个处理撞他下所有的回复数据
+     * @param tpTicketRecord
+     * @return
+     */
+	List<TpTicketRecordComment> selectByTicketRecordId(TpTicketRecord tpTicketRecord);
 }

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

@@ -2,6 +2,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTicketRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 import java.util.List;
 import java.util.Map;
@@ -20,10 +23,6 @@ public interface TpTicketRecordMapper {
 
     int updateByPrimaryKey(TpTicketRecord record);
 
-    /**
-     * 根据 小区ID/工单ID/流程状态
-     * @param map
-     * @return
-     */
-    List<TpTicketRecord> selectByCommunityIdOrByTicketIdOrByStatus(Map map);
+	List<TpTicketRecord> getTicketRecordByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
+
 }

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

@@ -2,6 +2,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TpTransactionMapper {
@@ -16,4 +19,6 @@ public interface TpTransactionMapper {
     int updateByPrimaryKeySelective(TpTransaction record);
 
     int updateByPrimaryKey(TpTransaction record);
+
+    List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("type") String type);
 }

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

@@ -0,0 +1,75 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaSysRole {
+    private Integer id;
+
+    private String roleName;
+
+    private String description;
+
+    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 String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName == null ? null : roleName.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.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/TaSysUserRole.java

@@ -0,0 +1,43 @@
+package com.community.huiju.model;
+
+public class TaSysUserRole {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer userId;
+
+    private Integer roleId;
+
+    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 getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTicket {
     private Integer id;
@@ -18,6 +19,11 @@ public class TpTicket {
     private String type;
 
     private String repairType;
+    
+    /**
+     * 报修类型的名字
+     */
+    private String repairName;
 
     private Integer tpUserId;
 
@@ -32,6 +38,8 @@ public class TpTicket {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    private List<TpTicketRecord> ticketRecordList;
 
     public Integer getId() {
         return id;
@@ -152,4 +160,20 @@ public class TpTicket {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getRepairName() {
+        return repairName;
+    }
+    
+    public void setRepairName(String repairName) {
+        this.repairName = repairName;
+    }
+    
+    public List<TpTicketRecord> getTicketRecordList() {
+        return ticketRecordList;
+    }
+    
+    public void setTicketRecordList(List<TpTicketRecord> ticketRecordList) {
+        this.ticketRecordList = ticketRecordList;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTicketRecord {
     private Integer id;
@@ -10,10 +11,14 @@ public class TpTicketRecord {
     private Integer ticketId;
 
     private String status;
+    
+    private String ticketStatusName;
 
     private Integer createUser;
 
     private Date createDate;
+    
+    private List<TpTicketRecordComment> ticketRecordCommentList;
 
     public Integer getId() {
         return id;
@@ -62,4 +67,20 @@ public class TpTicketRecord {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+    
+    public String getTicketStatusName() {
+        return ticketStatusName;
+    }
+    
+    public void setTicketStatusName(String ticketStatusName) {
+        this.ticketStatusName = ticketStatusName;
+    }
+    
+    public List<TpTicketRecordComment> getTicketRecordCommentList() {
+        return ticketRecordCommentList;
+    }
+    
+    public void setTicketRecordCommentList(List<TpTicketRecordComment> ticketRecordCommentList) {
+        this.ticketRecordCommentList = ticketRecordCommentList;
+    }
 }

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

@@ -7,7 +7,7 @@ public class TpTicketRecordComment {
 
     private Integer communityId;
 
-    private Integer tickerId;
+    private Integer ticketId;
 
     private Integer ticketRecordId;
 
@@ -38,15 +38,15 @@ public class TpTicketRecordComment {
     public void setCommunityId(Integer communityId) {
         this.communityId = communityId;
     }
-
-    public Integer getTickerId() {
-        return tickerId;
+    
+    public Integer getTicketId() {
+        return ticketId;
     }
-
-    public void setTickerId(Integer tickerId) {
-        this.tickerId = tickerId;
+    
+    public void setTicketId(Integer ticketId) {
+        this.ticketId = ticketId;
     }
-
+    
     public Integer getTicketRecordId() {
         return ticketRecordId;
     }

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

@@ -29,13 +29,12 @@ public interface ITicketService {
      * @return 返回 维修/投诉/联系单 记录列表
      */
     ResponseBean getByTypeList(TpTicket tpTicket,Integer pageNum, Integer pageSize);
-
-    /**
-     * 根据 工单ID 查询 维修/投诉/联系单 详情
-     * @param ticketId
-     * @return 返回 维修/投诉/联系单 详情
-     */
-    ResponseBean getById(Integer ticketId);
-
-
+	
+	/**
+	 * 获取报修详情
+	 * @param communityId
+	 * @param ticketId
+	 * @return
+	 */
+	TpTicket getTicketSchedule(String communityId, Integer ticketId);
 }

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

@@ -22,4 +22,9 @@ public interface MessageServiceI {
 	 * @return
 	 */
 	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType);
+
+	/**
+	 * 全部已读
+	 */
+	void updateMessageReadStatus(Integer communityId);
 }

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

@@ -1,10 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpSocialView;
+import com.community.huiju.model.*;
 
 import java.util.List;
 
@@ -53,4 +50,20 @@ public interface SocialServiceI {
 	TpActivity findActivityDetail(Integer activityId, Integer communityId);
 
 	ResponseBean findTaUserInfo(Integer id, Integer communityId);
+
+	/**
+	 * 获取所有的交易帖子
+	 * @param communityId
+	 * @param type
+	 * @return
+	 */
+	List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize);
+
+	/**
+	 * 终止报修
+	 * @param communityId
+	 * @param ticketId
+	 * @return
+	 */
+	ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId);
 }

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

@@ -50,4 +50,12 @@ public class MessageServiceImpl implements MessageServiceI {
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
 		return messageList;
 	}
+
+	/**
+	 * 消息全部已读
+	 */
+	@Override
+	public void updateMessageReadStatus(Integer communityId) {
+		tpMessageMapper.updateReadStatus(communityId);
+	}
 }

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

@@ -2,12 +2,8 @@ package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.commom.utils.DateUtils;
 import com.community.huiju.dao.*;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpSocialView;
+import com.community.huiju.model.*;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +35,25 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Autowired
     private TpActivitySignupMapper tpActivitySignupMapper;
-    
+
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private  TaSysUserRoleMapper taSysUserRoleMapper;
+
+    @Autowired
+    private TpTransactionMapper tpTransactionMapper;
+
+    @Autowired
+    private TpTicketRecordMapper tpTicketRecordMapper;
+
+    @Autowired
+    private TpTicketMapper tpTicketMapper;
+
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
@@ -148,24 +162,96 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findTaUserInfo(Integer id, Integer communityId) {
-//        ResponseBean responseBean = new ResponseBean();
-//        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(id);
-//        //判断是否已经过了报名截至时间
-//        Date registrEndTime = tpActivity.getRegistrationEndTime();
-//        if (registrEndTime.compareTo(new Date()) < 0){
-//            return responseBean.addError("9999", "已过报名截止时间");
-//        }
-//
-//        //报名是否超过人数上限
-//        Integer signUpNum = tpActivitySignupMapper.sumActivitySignUpNum(id, communityId);
-//        if (signUpNum > tpActivity.getSignUpMax()){
-//            return responseBean.addError("9998", "报名人数已满");
-//        }
-//
-//        //已登陆，身份未知，状态未知
-//
-//        //身份为业主，状态为已停用
-        return null;
+    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        //判断是否已经过了报名截至时间
+        Date registrEndTime = tpActivity.getRegistrationEndTime();
+        if (registrEndTime.compareTo(new Date()) < 0){
+             responseBean.addError("9997", "已过报名截止时间");
+             return responseBean;
+        }
+
+        //报名是否超过人数上限
+        Integer signUpNum = tpActivitySignupMapper.sumActivitySignUpNum(activityId, communityId);
+        if (signUpNum > tpActivity.getSignUpMax()){
+            responseBean.addError("9998", "报名人数已满");
+            return responseBean;
+        }
+
+        //已登陆，身份未知，状态未知
+
+
+
+        //判断身份是否为业主且状态为已停用
+        //从seession中获取的user_id
+        //TODO
+        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(1);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(1);
+        if (Constant.INVALID.equals(taUser.getStatus())
+            && Constant.OWNER.equals(sysRole.getRoleName())){
+
+            return insertActivitySignUp(tpActivity, communityId);
+        }
+
+        //身份为家属租客，状态为已停用
+        if (Constant.INVALID.equals(taUser.getStatus())
+            && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+
+            return insertActivitySignUp(tpActivity, communityId);
+        }
+
+        if (Constant.EFFECTIVE.equals(taUser.getStatus())
+                && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName()))
+                || Constant.TENANT.equals(sysRole.getRoleName())
+                || Constant.OWNER.equals(sysRole.getRoleName())){
+            return insertActivitySignUp(tpActivity, communityId);
+        }
+        responseBean.addError("9999", "服务器异常");
+        return responseBean;
+    }
+
+    @Override
+    public List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize) {
+        PageHelper.startPage(pageNum, paeSize);
+        return tpTransactionMapper.findAllTransaction(communityId, type);
+    }
+
+    @Transactional
+    @Override
+    public ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            TpTicket tpTicket = new TpTicket();
+            tpTicket.setStatus("6");
+            tpTicket.setId(ticketId);
+            tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+
+            TpTicketRecord tpTicketRecord = new TpTicketRecord();
+            tpTicketRecord.setStatus("6");
+            tpTicketRecord.setTicketId(ticketId);
+            tpTicketRecord.setCommunityId(communityId);
+            //TODO
+            tpTicketRecord.setCreateUser(1);
+            tpTicketRecord.setCreateDate(new Date());
+            tpTicketRecordMapper.insertSelective(tpTicketRecord);
+            return responseBean;
+        }catch(Exception e){
+            e.printStackTrace();
+            responseBean.addError("服务器异常");
+            return responseBean;
+        }
+    }
+
+    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        TpActivitySignup tpActivitySignup = new TpActivitySignup();
+        tpActivitySignup.setActivityId(tpActivity.getId());
+        tpActivitySignup.setCommunityId(communityId);
+        tpActivitySignup.setTaUserId(1);
+        tpActivitySignup.setSignUpTime(new Date());
+        tpActivitySignupMapper.insertSelective(tpActivitySignup);
+        responseBean.addSuccess("报名成功");
+        return responseBean;
     }
 }

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

@@ -38,12 +38,12 @@ public class TicketServiceImpl implements ITicketService {
 
     @Autowired
     private TpTicketMapper tpTicketMapper;
-
+    
     @Autowired
-    private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
+    private TpTicketRecordMapper tpTicketRecordMapper;
 
     @Autowired
-    private TpTicketRecordMapper tpTicketRecordMapper;
+    private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
 
     @Override
     public ResponseBean getList(TpTicket tpTicket,Integer pageNum, Integer pageSize) {
@@ -150,64 +150,25 @@ public class TicketServiceImpl implements ITicketService {
 
         return response;
     }
-
+    
+    /**
+     * 获取报修详情
+     * @param communityId
+     * @param ticketId
+     * @return
+     */
     @Override
-    public ResponseBean getById(Integer ticketId) {
-
-        ResponseBean response = new ResponseBean();
-
-        /**
-         * 1.查询 工单
-         * 2.查询 工单流程状态记录
-         * 3.查询 流程状态的 回复/追答 记录
-         */
-
-        // 工单记录
-        TpTicket tpTicket = tpTicketMapper.selectByPrimaryKey(ticketId);
-
-        // 查询参数
-        Map<String,Object> recordMap = Maps.newHashMap();
-        recordMap.put("communityId",tpTicket.getCommunityId());
-        recordMap.put("ticketId",tpTicket.getId());
-
-        // 待分配等 记录集合
-        List<TpTicketRecord> recordList = tpTicketRecordMapper.selectByCommunityIdOrByTicketIdOrByStatus(recordMap);
-
-        TpTicketRecordCommentVO tpTicketRecordCommentVO = new TpTicketRecordCommentVO();
-        BeanUtils.copyProperties(tpTicket,tpTicketRecordCommentVO);
-
-        // 转换待分配等 记录集合
-        List<TpTicketRecordVO> tpTicketRecordVOList = recordList.stream().map(e->{
-            TpTicketRecordVO tpTicketRecordVO = new TpTicketRecordVO();
-            BeanUtils.copyProperties(e,tpTicketRecordVO);
-            tpTicketRecordVO.setStatus(EnumUtils.getByCode(Integer.valueOf(e.getStatus()), TicketStatusEnum.class).toString());
-            return tpTicketRecordVO;
-        }).collect(Collectors.toList());
-
-        tpTicketRecordVOList.stream().map(e->{
-            // 查询参数
-            Map<String,Object> lastRecordMap = Maps.newHashMap();
-            // 表示查询出最新的一条
-            lastRecordMap.put("size",100);
-            // 设置工单编号
-            lastRecordMap.put("tickerId",e.getId());
-            List<TpTicketRecordComment> commentList = tpTicketRecordCommentMapper.selectByTicketId(lastRecordMap);
-            List<RecordCommentVO> commentVOList = commentList.stream().map(comment->{
-                RecordCommentVO commentVO = new RecordCommentVO();
-                BeanUtils.copyProperties(comment,commentVO);
-                commentVO.setUserType(EnumUtils.getByCode(Integer.valueOf(comment.getUserType()), TicketUserTypeEnum.class).toString());
-                return commentVO;
-            }).collect(Collectors.toList());
-
-
-            e.setComments(commentVOList);
-            return e;
-
-        }).collect(Collectors.toList());
-
-
-        response.addSuccess(tpTicketRecordVOList);
-
-        return response;
+    public TpTicket getTicketSchedule(String communityId, Integer ticketId) {
+        //查看工单详情
+        TpTicket ticket = tpTicketMapper.selectByTicketId(communityId,ticketId);
+        //工单进度
+        List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(communityId,ticketId);
+        //工单回复
+        ticketRecordList.stream().forEach(TpTicketRecord -> {
+            List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
+            TpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
+         });
+        ticket.setTicketRecordList(ticketRecordList);
+        return ticket;
     }
 }

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

@@ -0,0 +1,124 @@
+<?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.TaSysRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaSysRole" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, role_name, description, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_sys_role
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_sys_role
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaSysRole" >
+    insert into ta_sys_role (id, role_name, description, 
+      create_user, create_date, update_user, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaSysRole" >
+    insert into ta_sys_role
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="roleName != null" >
+        role_name,
+      </if>
+      <if test="description != null" >
+        description,
+      </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="roleName != null" >
+        #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        #{description,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.TaSysRole" >
+    update ta_sys_role
+    <set >
+      <if test="roleName != null" >
+        role_name = #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        description = #{description,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.TaSysRole" >
+    update ta_sys_role
+    set role_name = #{roleName,jdbcType=VARCHAR},
+      description = #{description,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="findRoleByUserId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_sys_role
+    	where id = (select role_id from ta_sys_user_role where user_id = #{userId})
+  </select>
+
+</mapper>

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

@@ -0,0 +1,89 @@
+<?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.TaSysUserRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaSysUserRole" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, user_id, role_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_sys_user_role
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_sys_user_role
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaSysUserRole" >
+    insert into ta_sys_user_role (id, community_id, user_id, 
+      role_id)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
+      #{roleId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaSysUserRole" >
+    insert into ta_sys_user_role
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="roleId != null" >
+        role_id,
+      </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="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaSysUserRole" >
+    update ta_sys_user_role
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        role_id = #{roleId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaSysUserRole" >
+    update ta_sys_user_role
+    set community_id = #{communityId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
+      role_id = #{roleId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="findSysUserRoleByUserIdAndRoleId" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
+    select
+    count(*)
+    from ta_sys_user_role
+    where user_id = #{userId,jdbcType=INTEGER} and role_id = 1
+  </select>
+</mapper>

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

@@ -28,11 +28,11 @@
     activity_start_time, activity_end_time, status, create_user, create_date, update_user, 
     update_date
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+    select
     <include refid="Base_Column_List" />
     from tp_activity
-    where id = #{id,jdbcType=INTEGER} and #{communityId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_activity

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

@@ -262,4 +262,15 @@
     ORDER BY
     create_date DESC
   </select>
+
+  <update id="updateReadStatus" parameterType="java.lang.Integer" >
+    update tp_message
+    set
+      read_status = 1
+    where community_id = #{communityId}
+    and advice_type = 1
+    and model_type = 1
+    and source = 1
+  </update>
+
 </mapper>

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

@@ -10,6 +10,7 @@
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="type" property="type" jdbcType="CHAR" />
     <result column="repair_type" property="repairType" jdbcType="CHAR" />
+    <result column="repair_name" property="repairName" jdbcType="VARCHAR" />
     <result column="tp_user_id" property="tpUserId" jdbcType="INTEGER" />
     <result column="score" property="score" jdbcType="VARCHAR" />
     <result column="comment" property="comment" jdbcType="VARCHAR" />
@@ -224,4 +225,26 @@
         </if>
       </trim>
   </select>
+
+  <select id="selectByTicketId" resultMap="BaseResultMap" >
+     SELECT
+        t.id,
+        t.community_id,
+        t.ticket_title,
+        t.ticket_content,
+        t.STATUS,
+        t.type,
+        t.repair_type,
+        d.name as repair_name,
+        t.score,
+        t.COMMENT,
+        t.create_date
+    FROM
+        tp_ticket t
+        LEFT JOIN sys_dictionary d ON t.repair_type = d.CODE
+        AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_repair_type" )
+    WHERE
+        t.id = #{ticketId,jdbcType=INTEGER}
+        AND t.community_id = #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTicketRecordComment" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="ticker_id" property="tickerId" jdbcType="INTEGER" />
+    <result column="ticket_id" property="ticketId" jdbcType="INTEGER" />
     <result column="ticket_record_id" property="ticketRecordId" jdbcType="INTEGER" />
     <result column="uuid" property="uuid" jdbcType="INTEGER" />
     <result column="user_type" property="userType" jdbcType="CHAR" />
@@ -14,7 +14,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ticker_id, ticket_record_id, uuid, user_type, content, parent_id, 
+    id, community_id, ticket_id, ticket_record_id, uuid, user_type, content, parent_id,
     user_name, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -28,11 +28,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecordComment" >
-    insert into tp_ticket_record_comment (id, community_id, ticker_id, 
+    insert into tp_ticket_record_comment (id, community_id, ticket_id,
       ticket_record_id, uuid, user_type, 
       content, parent_id, user_name, 
       create_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{tickerId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},
       #{ticketRecordId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, #{userType,jdbcType=CHAR}, 
       #{content,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
       #{createDate,jdbcType=TIMESTAMP})
@@ -46,8 +46,8 @@
       <if test="communityId != null" >
         community_id,
       </if>
-      <if test="tickerId != null" >
-        ticker_id,
+      <if test="ticketId != null" >
+        ticket_id,
       </if>
       <if test="ticketRecordId != null" >
         ticket_record_id,
@@ -78,8 +78,8 @@
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="tickerId != null" >
-        #{tickerId,jdbcType=INTEGER},
+      <if test="ticketId != null" >
+        #{ticketId,jdbcType=INTEGER},
       </if>
       <if test="ticketRecordId != null" >
         #{ticketRecordId,jdbcType=INTEGER},
@@ -110,8 +110,8 @@
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="tickerId != null" >
-        ticker_id = #{tickerId,jdbcType=INTEGER},
+      <if test="ticketId != null" >
+        ticket_id = #{ticketId,jdbcType=INTEGER},
       </if>
       <if test="ticketRecordId != null" >
         ticket_record_id = #{ticketRecordId,jdbcType=INTEGER},
@@ -140,7 +140,7 @@
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTicketRecordComment" >
     update tp_ticket_record_comment
     set community_id = #{communityId,jdbcType=INTEGER},
-      ticker_id = #{tickerId,jdbcType=INTEGER},
+      ticket_id = #{ticketId,jdbcType=INTEGER},
       ticket_record_id = #{ticketRecordId,jdbcType=INTEGER},
       uuid = #{uuid,jdbcType=INTEGER},
       user_type = #{userType,jdbcType=CHAR},
@@ -155,6 +155,17 @@
     select ttrc.* from tp_ticket tp
                 inner join tp_ticket_record ttr on tp.id = ttr.ticket_id
                 inner join tp_ticket_record_comment ttrc on ttr.ticket_id = ttrc.ticket_record_id
-    where tp.id=#{tickerId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+    where tp.id=#{ticketId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+  </select>
+
+  <select id="selectByTicketRecordId" parameterType="com.community.huiju.model.TpTicketRecord" resultMap="BaseResultMap" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM
+        tp_ticket_record_comment
+    WHERE
+        community_id = #{communityId,jdbcType=INTEGER}
+        AND ticket_id = #{ticketId,jdbcType=INTEGER}
+        AND ticket_record_id = #{id,jdbcType=INTEGER}
   </select>
 </mapper>

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

@@ -16,7 +16,7 @@
     select 
     <include refid="Base_Column_List" />
     from tp_ticket_record
-    where id = #{id,jdbcType=INTEGER}
+    where ticket_id = #{ticketId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_ticket_record
@@ -92,7 +92,7 @@
         create_date = #{createDate,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where id = #{id,jdbcType=INTEGER}
+    where ticket_id = #{ticketId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTicketRecord" >
     update tp_ticket_record
@@ -104,20 +104,20 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="selectByCommunityIdOrByTicketIdOrByStatus" parameterType="map" resultMap="BaseResultMap" >
-    select
-    <include refid="Base_Column_List" />
-    from tp_ticket_record
-    <trim prefix="where" prefixOverrides="and">
-      <if test="communityId != null" >
-        and community_id = #{communityId,jdbcType=INTEGER}
-      </if>
-      <if test="ticketId != null" >
-        and ticket_id = #{ticketId,jdbcType=INTEGER}
-      </if>
-      <if test="status != null" >
-        and status = #{status,jdbcType=CHAR}
-      </if>
-    </trim>
+
+  <select id="getTicketRecordByTicketId" resultType="com.community.huiju.model.TpTicketRecord">
+    SELECT
+        t.id,
+        t.ticket_id AS ticketId,
+        t.community_id AS communityId,
+        d.NAME AS ticketStatusName
+    FROM
+        tp_ticket_record t
+        LEFT JOIN sys_dictionary d ON t.STATUS = d.CODE
+        AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
+    WHERE
+        community_id = #{communityId,jdbcType=INTEGER}
+        AND ticket_id = #{ticketId,jdbcType=INTEGER}
+
   </select>
 </mapper>

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

@@ -232,4 +232,11 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="findAllTransaction" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tp_transaction
+    where community_id = #{communityId,jdbcType=INTEGER} and type = #{type,jdbcType=VARCHAR}
+  </select>
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -45,4 +45,18 @@ public class Constant {
     /** 社交二手租赁类型**/
     public static final String LEASE = "lease";
 
+    /**有效状态**/
+    public static final Integer EFFECTIVE = 1;
+
+    /**无效状态**/
+    public static final Integer INVALID = 0;
+
+    /**业主角色**/
+    public static final String OWNER = "owner";
+
+    /**租客角色**/
+    public static final String TENANT = "tenant";
+
+    /**家属角色**/
+    public static final String FAMILYMEMBER = "familyMember";
 }