提交分支

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
@@ -47,5 +48,37 @@ public class TicketController {
         response = iTicketService.getList(tpTicket,pageNum,pageSize);
         return response;
     }
+    
+    public ResponseBean getTicketSchedule(){
+        ResponseBean responseBean = new ResponseBean();
+        return responseBean;
+    }
+    
+    @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
+    })
+    public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
+                                       @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "type") String type,
+                                       HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setCommunityId(Integer.valueOf(communityId));
+        tpTicket.setTaUserId(userElement.getId());
+        tpTicket.setType(type);
 
+        responseBean = iTicketService.getByTypeList(tpTicket,pageNum,pageSize);
+
+        return responseBean;
+
+    }
 }

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

@@ -32,7 +32,7 @@ public class UserController {
     @Autowired
     private ITaUserService iTaUserService;
 
-    @ApiOperation(value = "登录", notes = "根据登录名和密码")
+    @ApiOperation(value = "登录", notes = "根据登录名和验证码")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "登陆名(手机号)"),

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/TpActivitySignupMapper.java

@@ -4,6 +4,7 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpActivitySignup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 @Mapper
 public interface TpActivitySignupMapper {
     int deleteByPrimaryKey(Integer id);

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/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/TaUser.java

@@ -1,6 +1,5 @@
 package com.community.huiju.model;
 
-
 import java.util.Date;
 
 public class TaUser {
@@ -149,7 +148,7 @@ public class TaUser {
     }
 
     public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus;
+        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
     }
 
     public Integer getCreateUser() {

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

@@ -19,16 +19,6 @@ public class TpTicket {
 
     private String repairType;
 
-    private String ticketMatchImg1;
-
-    private String ticketMatchImg2;
-
-    private String ticketMatchImg3;
-
-    private String ticketMatchImg4;
-
-    private String ticketMatchImg5;
-
     private Integer tpUserId;
 
     private String score;
@@ -107,46 +97,6 @@ public class TpTicket {
         this.repairType = repairType == null ? null : repairType.trim();
     }
 
-    public String getTicketMatchImg1() {
-        return ticketMatchImg1;
-    }
-
-    public void setTicketMatchImg1(String ticketMatchImg1) {
-        this.ticketMatchImg1 = ticketMatchImg1 == null ? null : ticketMatchImg1.trim();
-    }
-
-    public String getTicketMatchImg2() {
-        return ticketMatchImg2;
-    }
-
-    public void setTicketMatchImg2(String ticketMatchImg2) {
-        this.ticketMatchImg2 = ticketMatchImg2 == null ? null : ticketMatchImg2.trim();
-    }
-
-    public String getTicketMatchImg3() {
-        return ticketMatchImg3;
-    }
-
-    public void setTicketMatchImg3(String ticketMatchImg3) {
-        this.ticketMatchImg3 = ticketMatchImg3 == null ? null : ticketMatchImg3.trim();
-    }
-
-    public String getTicketMatchImg4() {
-        return ticketMatchImg4;
-    }
-
-    public void setTicketMatchImg4(String ticketMatchImg4) {
-        this.ticketMatchImg4 = ticketMatchImg4 == null ? null : ticketMatchImg4.trim();
-    }
-
-    public String getTicketMatchImg5() {
-        return ticketMatchImg5;
-    }
-
-    public void setTicketMatchImg5(String ticketMatchImg5) {
-        this.ticketMatchImg5 = ticketMatchImg5 == null ? null : ticketMatchImg5.trim();
-    }
-
     public Integer getTpUserId() {
         return tpUserId;
     }

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

@@ -17,9 +17,18 @@ public interface ITicketService {
      * @param tpTicket
      * @param pageCode
      * @param pageSize
-     * @return
+     * @return 返回 维修/投诉/联系单 各 pageSize 条
      */
     ResponseBean getList(TpTicket tpTicket,Integer pageCode, Integer pageSize);
 
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param tpTicket
+     * @param pageNum
+     * @param pageSize
+     * @return 返回 维修/投诉/联系单 记录列表
+     */
+    ResponseBean getByTypeList(TpTicket tpTicket,Integer pageNum, Integer pageSize);
+
 
 }

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

@@ -42,10 +42,9 @@ public class TicketServiceImpl implements ITicketService {
         Map<String,Object> parameter = Maps.newHashMap();
         parameter.put("communityId",tpTicket.getCommunityId());
         parameter.put("taUserId",tpTicket.getTaUserId());
+
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type",0);
-
-
         // 报修
         PageHelper.startPage(pageNum,pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
@@ -116,4 +115,26 @@ public class TicketServiceImpl implements ITicketService {
         });
     }
 
+    @Override
+    public ResponseBean getByTypeList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
+
+        ResponseBean response = new ResponseBean();
+
+        Map<String,Object> parameter = Maps.newHashMap();
+        parameter.put("communityId",tpTicket.getCommunityId());
+        parameter.put("taUserId",tpTicket.getTaUserId());
+
+        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        parameter.put("type",tpTicket.getType());
+
+        PageHelper.startPage(pageNum,pageSize);
+        List<TpTicket> tpTicketList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
+
+        List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
+        tpTicketVOConvert(tpTicketList,tpTicketVOList);
+
+        response.addSuccess(tpTicketVOList);
+
+        return response;
+    }
 }

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/TaUserMapper.xml

@@ -8,7 +8,7 @@
     <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
     <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="login_name" property="loginName" jdbcType="VARCHAR" />
-    <!--<result column="login_password" property="loginPassword" jdbcType="VARCHAR" />-->
+    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
     <result column="email" property="email" jdbcType="VARCHAR" />
     <result column="gender" property="gender" jdbcType="CHAR" />
     <result column="status" property="status" jdbcType="CHAR" />
@@ -23,11 +23,11 @@
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
-    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,create_user, create_date,
-    update_user, update_date
+    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
+    create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from ta_user
     where id = #{id,jdbcType=INTEGER}
@@ -37,18 +37,20 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TaUser" >
-    insert into ta_user (id, community_id, building_owner_info_id, 
-      head_portrait, user_name, login_name, 
-      login_password, email, gender, 
-      status, remark, parent_id, 
-      accept_agreement_status, verify_status, create_user, create_date,
-      update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER}, 
-      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
-      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, 
-      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, 
-      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+    insert into ta_user (id, community_id, building_owner_info_id,
+      head_portrait, user_name, login_name,
+      login_password, email, gender,
+      status, remark, parent_id,
+      accept_agreement_status, verify_status, create_user,
+      create_date, update_user, update_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
+      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
+      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
+      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
+      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" >
     insert into ta_user
@@ -92,7 +94,7 @@
       <if test="acceptAgreementStatus != null" >
         accept_agreement_status,
       </if>
-      <if test="verifyStatus != null">
+      <if test="verifyStatus != null" >
         verify_status,
       </if>
       <if test="createUser != null" >
@@ -148,7 +150,7 @@
       <if test="acceptAgreementStatus != null" >
         #{acceptAgreementStatus,jdbcType=CHAR},
       </if>
-      <if test="verifyStatus != null">
+      <if test="verifyStatus != null" >
         #{verifyStatus,jdbcType=CHAR},
       </if>
       <if test="createUser != null" >
@@ -204,7 +206,7 @@
       <if test="acceptAgreementStatus != null" >
         accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
       </if>
-      <if test="verifyStatus != null">
+      <if test="verifyStatus != null" >
         verify_status = #{verifyStatus,jdbcType=CHAR},
       </if>
       <if test="createUser != null" >
@@ -248,14 +250,13 @@
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where login_name=#{loginName} and login_password = #{loginPassword}
+    where login_name=#{loginName,jdbcType=VARCHAR} and login_password = #{loginPassword,jdbcType=VARCHAR}
   </select>
 
   <select id="selectByLoginName" parameterType="map" resultMap="BaseResultMap" >
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where login_name=#{loginName}
+    where login_name=#{loginName,jdbcType=VARCHAR}
   </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,11 +10,6 @@
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="type" property="type" jdbcType="CHAR" />
     <result column="repair_type" property="repairType" jdbcType="CHAR" />
-    <result column="ticket_match_img1" property="ticketMatchImg1" jdbcType="VARCHAR" />
-    <result column="ticket_match_img2" property="ticketMatchImg2" jdbcType="VARCHAR" />
-    <result column="ticket_match_img3" property="ticketMatchImg3" jdbcType="VARCHAR" />
-    <result column="ticket_match_img4" property="ticketMatchImg4" jdbcType="VARCHAR" />
-    <result column="ticket_match_img5" property="ticketMatchImg5" 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" />
@@ -24,8 +19,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type, 
-    ticket_match_img1, ticket_match_img2, ticket_match_img3, ticket_match_img4, ticket_match_img5, 
+    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type,
     tp_user_id, score, comment, create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -41,16 +35,12 @@
   <insert id="insert" parameterType="com.community.huiju.model.TpTicket" >
     insert into tp_ticket (id, community_id, ta_user_id, 
       ticket_title, ticket_content, status, 
-      type, repair_type, ticket_match_img1, 
-      ticket_match_img2, ticket_match_img3, ticket_match_img4, 
-      ticket_match_img5, tp_user_id, score, 
+      type, repair_type, tp_user_id, score,
       comment, create_user, create_date, 
       update_user, update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
       #{ticketTitle,jdbcType=VARCHAR}, #{ticketContent,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, 
-      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{ticketMatchImg1,jdbcType=VARCHAR}, 
-      #{ticketMatchImg2,jdbcType=VARCHAR}, #{ticketMatchImg3,jdbcType=VARCHAR}, #{ticketMatchImg4,jdbcType=VARCHAR}, 
-      #{ticketMatchImg5,jdbcType=VARCHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR}, 
+      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR},
       #{comment,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
@@ -81,21 +71,6 @@
       <if test="repairType != null" >
         repair_type,
       </if>
-      <if test="ticketMatchImg1 != null" >
-        ticket_match_img1,
-      </if>
-      <if test="ticketMatchImg2 != null" >
-        ticket_match_img2,
-      </if>
-      <if test="ticketMatchImg3 != null" >
-        ticket_match_img3,
-      </if>
-      <if test="ticketMatchImg4 != null" >
-        ticket_match_img4,
-      </if>
-      <if test="ticketMatchImg5 != null" >
-        ticket_match_img5,
-      </if>
       <if test="tpUserId != null" >
         tp_user_id,
       </if>
@@ -143,21 +118,6 @@
       <if test="repairType != null" >
         #{repairType,jdbcType=CHAR},
       </if>
-      <if test="ticketMatchImg1 != null" >
-        #{ticketMatchImg1,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg2 != null" >
-        #{ticketMatchImg2,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg3 != null" >
-        #{ticketMatchImg3,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg4 != null" >
-        #{ticketMatchImg4,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg5 != null" >
-        #{ticketMatchImg5,jdbcType=VARCHAR},
-      </if>
       <if test="tpUserId != null" >
         #{tpUserId,jdbcType=INTEGER},
       </if>
@@ -205,21 +165,6 @@
       <if test="repairType != null" >
         repair_type = #{repairType,jdbcType=CHAR},
       </if>
-      <if test="ticketMatchImg1 != null" >
-        ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg2 != null" >
-        ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg3 != null" >
-        ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg4 != null" >
-        ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg5 != null" >
-        ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
-      </if>
       <if test="tpUserId != null" >
         tp_user_id = #{tpUserId,jdbcType=INTEGER},
       </if>
@@ -253,11 +198,6 @@
       status = #{status,jdbcType=CHAR},
       type = #{type,jdbcType=CHAR},
       repair_type = #{repairType,jdbcType=CHAR},
-      ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
-      ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
-      ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
-      ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
-      ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
       tp_user_id = #{tpUserId,jdbcType=INTEGER},
       score = #{score,jdbcType=VARCHAR},
       comment = #{comment,jdbcType=VARCHAR},

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

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";
 }