解决冲突

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

@@ -0,0 +1,59 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.BillServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-10-25
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "缴费相关的API", description = "缴费相关的API")
+public class BillController {
+	
+	@Autowired
+	private BillServiceI billServiceI;
+	
+	@ApiOperation(value = "获取本人的收费账单信息(已缴费或未缴费)", notes = "获取本人的收费账单信息(已缴费或未缴费)")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+	@RequestMapping(value = "/bills/{communityId}/{payType}",method = RequestMethod.GET)
+	public ResponseBean getBillInvoice(@PathVariable Integer communityId,
+	                                   @PathVariable Integer payType,
+	                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+		ResponseBean responseBean = new ResponseBean();
+		List<Map<String,Object>> billsList = billServiceI.getBillsList(communityId,payType,pageNum,pageSize);
+		responseBean.addSuccess(billsList);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取账单的详细信息", notes = "获取账单的详细信息")
+	@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+						@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单id")})
+	@RequestMapping(value = "/bill/{communityId}/{billInvoiceId}",method = RequestMethod.GET)
+	public ResponseBean getBillInvoiceDetail(@PathVariable Integer communityId,@PathVariable Integer billInvoiceId){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String,Object> billInvoiceMap = billServiceI.getBillInvoiceDetail(communityId,billInvoiceId);
+		responseBean.addSuccess(billInvoiceMap);
+		return responseBean;
+	}
+}

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

@@ -6,11 +6,14 @@ import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
+import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.service.ITicketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Example;
+import io.swagger.annotations.ExampleProperty;
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -69,8 +72,8 @@ public class TicketController {
     @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联系单)"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
     })
     public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
                                        @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
@@ -91,6 +94,21 @@ public class TicketController {
         return responseBean;
 
     }
+    @ApiOperation(value = "回复 报修/投诉/联系单 追问接口", notes = "回复 报修/投诉/联系单 追问接口")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType ="body")})
+    @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
+    public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment){
+        ResponseBean responseBean = new ResponseBean();
+        tpTicketRecordComment.setCommunityId(communityId);
+        Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment);
+        if (size > 0){
+            responseBean.addSuccess(size);
+        }else{
+            responseBean.addError("更新失败");
+        }
+        return responseBean;
+    }
 
     @ApiOperation(value = "添加报修", notes = "添加报修")
     @ApiImplicitParams({

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

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.code.cache.AppkeyCache;
@@ -71,5 +72,68 @@ public class UserController {
         return response;
     }
 
+    @ApiOperation(value = "修改用户名和性别", notes = "修改用户名和性别")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userName",value = "用户民"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "gender",value = "性别")
+    })
+    @RequestMapping(value = "/user/update/info",method = RequestMethod.PUT)
+    public ResponseBean updateUserNameAndGender(@RequestBody TaUser user,
+                                                HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        user.setId(userElement.getId());
+
+        response = iTaUserService.modifyUser(user);
+        return response;
+
+    }
+
+    @ApiOperation(value = "租客或家属 启用或者停用", notes = "租客或家属 启用或者停用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "userId",value = "租客或者家属"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "type",value = "1启用 0停用")
+    })
+    @RequestMapping(value = "/user/update/dependentsOrTenants",method = RequestMethod.PUT)
+    public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
+                                                HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        response = iTaUserService.startOrEndUsingUser(userElement.getId(),jsonObject.getInteger("userId"),jsonObject.getInteger("type"));
+
+        return response;
+
+    }
+
+
+    @ApiOperation(value = "业主添加 租客或家属", notes = "业主添加 租客或家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userName",value = "租客或者家属 姓名"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "租客或者家属 手机号"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "gender",value = "租客或者家属 性别 1男 2女"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "type",value = "1家属 0租客")
+    })
+    @RequestMapping(value = "/user/update/addTenantsOrDependents",method = RequestMethod.POST)
+    public ResponseBean addTenantsOrDependents(@RequestBody String parameter,
+                                               HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        response = iTaUserService.addTenantsOrDependents(jsonObject.getString("userName"),
+                jsonObject.getString("phone"),jsonObject.getString("gender"),
+                userElement.getId(),
+                jsonObject.getInteger("type"));
+
+        return response;
+
+    }
+
+
 
 }

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

@@ -0,0 +1,39 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpBillInvoice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TpBillInvoiceMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpBillInvoice record);
+
+    int insertSelective(TpBillInvoice record);
+
+    TpBillInvoice selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpBillInvoice record);
+
+    int updateByPrimaryKey(TpBillInvoice record);
+    
+    /**
+     * 分页获取缴费和未缴费的数据
+     * @param communityId
+     * @param userId
+     * @param payType
+     * @return
+     */
+    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("userId") Integer userId,@Param("payType") Integer payType);
+    
+    /**
+     * 获取账单的详细信息
+     * @param billInvoiceId
+     * @return
+     */
+    Map<String, Object> getBillInvoiceDetail(@Param("communityId") Integer communityId,@Param("billInvoiceId") Integer billInvoiceId);
+}

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

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

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

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

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

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

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

@@ -0,0 +1,145 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpBill {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String billName;
+
+    private String billExplain;
+
+    private String payPrice;
+
+    private Integer payTotalNum;
+
+    private Integer payedNum;
+
+    private Integer unpayedNum;
+
+    private String billStatus;
+
+    private Date endDate;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getBillName() {
+        return billName;
+    }
+
+    public void setBillName(String billName) {
+        this.billName = billName == null ? null : billName.trim();
+    }
+
+    public String getBillExplain() {
+        return billExplain;
+    }
+
+    public void setBillExplain(String billExplain) {
+        this.billExplain = billExplain == null ? null : billExplain.trim();
+    }
+
+    public String getPayPrice() {
+        return payPrice;
+    }
+
+    public void setPayPrice(String payPrice) {
+        this.payPrice = payPrice == null ? null : payPrice.trim();
+    }
+
+    public Integer getPayTotalNum() {
+        return payTotalNum;
+    }
+
+    public void setPayTotalNum(Integer payTotalNum) {
+        this.payTotalNum = payTotalNum;
+    }
+
+    public Integer getPayedNum() {
+        return payedNum;
+    }
+
+    public void setPayedNum(Integer payedNum) {
+        this.payedNum = payedNum;
+    }
+
+    public Integer getUnpayedNum() {
+        return unpayedNum;
+    }
+
+    public void setUnpayedNum(Integer unpayedNum) {
+        this.unpayedNum = unpayedNum;
+    }
+
+    public String getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(String billStatus) {
+        this.billStatus = billStatus == null ? null : billStatus.trim();
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    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/TpBillInvoice.java

@@ -0,0 +1,155 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpBillInvoice {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer billId;
+
+    private Integer buildingOwnerInfoId;
+
+    private Integer taUserId;
+
+    private String billInvoiceExplain;
+
+    private Integer payPrice;
+
+    private Integer billStatementId;
+
+    private String billStatus;
+
+    private String payName;
+
+    private Date payDate;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getBillId() {
+        return billId;
+    }
+
+    public void setBillId(Integer billId) {
+        this.billId = billId;
+    }
+
+    public Integer getBuildingOwnerInfoId() {
+        return buildingOwnerInfoId;
+    }
+
+    public void setBuildingOwnerInfoId(Integer buildingOwnerInfoId) {
+        this.buildingOwnerInfoId = buildingOwnerInfoId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getBillInvoiceExplain() {
+        return billInvoiceExplain;
+    }
+
+    public void setBillInvoiceExplain(String billInvoiceExplain) {
+        this.billInvoiceExplain = billInvoiceExplain == null ? null : billInvoiceExplain.trim();
+    }
+
+    public Integer getPayPrice() {
+        return payPrice;
+    }
+
+    public void setPayPrice(Integer payPrice) {
+        this.payPrice = payPrice;
+    }
+
+    public Integer getBillStatementId() {
+        return billStatementId;
+    }
+
+    public void setBillStatementId(Integer billStatementId) {
+        this.billStatementId = billStatementId;
+    }
+
+    public String getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(String billStatus) {
+        this.billStatus = billStatus == null ? null : billStatus.trim();
+    }
+
+    public String getPayName() {
+        return payName;
+    }
+
+    public void setPayName(String payName) {
+        this.payName = payName == null ? null : payName.trim();
+    }
+
+    public Date getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(Date payDate) {
+        this.payDate = payDate;
+    }
+
+    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/TpBillStatement.java

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpBillStatement {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer billInvoiceId;
+
+    private Integer taUserId;
+
+    private Integer payPrice;
+
+    private String payName;
+
+    private String payRemark;
+
+    private String payType;
+
+    private Date createTime;
+
+    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 getBillInvoiceId() {
+        return billInvoiceId;
+    }
+
+    public void setBillInvoiceId(Integer billInvoiceId) {
+        this.billInvoiceId = billInvoiceId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public Integer getPayPrice() {
+        return payPrice;
+    }
+
+    public void setPayPrice(Integer payPrice) {
+        this.payPrice = payPrice;
+    }
+
+    public String getPayName() {
+        return payName;
+    }
+
+    public void setPayName(String payName) {
+        this.payName = payName == null ? null : payName.trim();
+    }
+
+    public String getPayRemark() {
+        return payRemark;
+    }
+
+    public void setPayRemark(String payRemark) {
+        this.payRemark = payRemark == null ? null : payRemark.trim();
+    }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType == null ? null : payType.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -0,0 +1,165 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpBuildingOwnerInfo {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String idCard;
+
+    private String building;
+
+    private String unit;
+
+    private String level;
+
+    private String roomNo;
+
+    private String ownerName;
+
+    private String ownerTel;
+
+    private String gender;
+
+    private String pairStatus;
+
+    private String verifyStatus;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard == null ? null : idCard.trim();
+    }
+
+    public String getBuilding() {
+        return building;
+    }
+
+    public void setBuilding(String building) {
+        this.building = building == null ? null : building.trim();
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level == null ? null : level.trim();
+    }
+
+    public String getRoomNo() {
+        return roomNo;
+    }
+
+    public void setRoomNo(String roomNo) {
+        this.roomNo = roomNo == null ? null : roomNo.trim();
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName == null ? null : ownerName.trim();
+    }
+
+    public String getOwnerTel() {
+        return ownerTel;
+    }
+
+    public void setOwnerTel(String ownerTel) {
+        this.ownerTel = ownerTel == null ? null : ownerTel.trim();
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender == null ? null : gender.trim();
+    }
+
+    public String getPairStatus() {
+        return pairStatus;
+    }
+
+    public void setPairStatus(String pairStatus) {
+        this.pairStatus = pairStatus == null ? null : pairStatus.trim();
+    }
+
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus == null ? null : verifyStatus.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/TpTicketRecordComment.java

@@ -12,6 +12,8 @@ public class TpTicketRecordComment {
     private Integer ticketId;
 
     private Integer ticketRecordId;
+    
+    private Integer ticketRecordCommentId;
 
     private Integer uuid;
 
@@ -104,4 +106,12 @@ public class TpTicketRecordComment {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+    
+    public Integer getTicketRecordCommentId() {
+        return ticketRecordCommentId;
+    }
+    
+    public void setTicketRecordCommentId(Integer ticketRecordCommentId) {
+        this.ticketRecordCommentId = ticketRecordCommentId;
+    }
 }

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

@@ -0,0 +1,23 @@
+package com.community.huiju.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BillServiceI {
+	/**
+	 * 根据payType分页获取缴费或未缴费的数据
+	 * @param communityId
+	 * @param payType
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 获取账单的详细信息
+	 * @param billInvoiceId
+	 * @return
+	 */
+	Map<String, Object> getBillInvoiceDetail(Integer communityId,Integer billInvoiceId);
+}

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

@@ -40,5 +40,32 @@ public interface ITaUserService {
     ResponseBean udDateloginName(Integer id, String paramets);
 
 
+    /**
+     * 修改用户
+     * @param user
+     * @return
+     */
+    ResponseBean modifyUser(TaUser user);
+
+    /**
+     * 停用用户 或者 启用用户
+     * @param currentUserId 当前用户(业主)
+     * @param userId
+     * @param type 1启用 0停用
+     * @return
+     */
+    ResponseBean startOrEndUsingUser(Integer currentUserId,Integer userId,Integer type);
+
+
+    /**
+     * 添加租客或者家属
+     * @param userName
+     * @param phone
+     * @param gender
+     * @param currentUserId 当前用户(业主)
+     * @param type 1家属 0租客
+     * @return
+     */
+    ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type);
 
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.vo.TpTicketVO;
 
 import java.util.List;
@@ -46,4 +47,11 @@ public interface ITicketService {
 	 * @return
 	 */
     ResponseBean addAiTicketService(Integer userId, TpTicket tpTicket);
+	
+	/**
+	 * 回复工单
+	 * @param tpTicketRecordComment
+	 * @return
+	 */
+	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment);
 }

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

@@ -0,0 +1,49 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.service.BillServiceI;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-10-25
+ */
+@Service("billService")
+public class BillServiceImpl implements BillServiceI {
+	
+	@Autowired
+	private TpBillInvoiceMapper tpBillInvoiceMapper;
+	
+	/**
+	 * 根据payType分页获取缴费或未缴费的数据
+	 * @param communityId
+	 * @param payType
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	@Override
+	public List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer pageNum, Integer pageSize) {
+		//todo
+		Integer userId = 1;
+		//使用分页插件
+		PageHelper.startPage(pageNum, pageSize);
+		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(communityId,userId,payType);
+		return billsList;
+	}
+	
+	/**
+	 * 获取账单的详细信息
+	 * @param billInvoiceId
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> getBillInvoiceDetail(Integer communityId,Integer billInvoiceId) {
+		return tpBillInvoiceMapper.getBillInvoiceDetail(communityId,billInvoiceId);
+	}
+}

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

@@ -5,13 +5,19 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
 import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaSysUserRoleMapper;
 import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
+import com.community.huiju.model.TaSysRole;
+import com.community.huiju.model.TaSysUserRole;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.vo.TaUserVO;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +37,15 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+    @Autowired
+    private TaSysUserRoleMapper taSysUserRoleMapper;
+
     @Transactional
     @Override
     public ResponseBean login(TaUser user) {
@@ -169,4 +184,152 @@ public class TaUserServiceImpl implements ITaUserService {
 
     }
 
+    @Transactional
+    @Override
+    public ResponseBean modifyUser(TaUser user) {
+
+        ResponseBean response = new ResponseBean();
+
+        TaUser taUser = taUserMapper.selectByPrimaryKey(user.getId());
+        BeanUtils.copyProperties(user,taUser);
+
+        int result = taUserMapper.updateByPrimaryKeySelective(taUser);
+
+        if (result > 0){
+            response.addSuccess("修改成功!");
+        }else {
+            response.addError("修改失败!");
+        }
+
+        return response;
+    }
+
+    @Transactional
+    @Override
+    public ResponseBean startOrEndUsingUser(Integer currentUserId, Integer userId, Integer type) {
+        ResponseBean response = null;
+        if ("1".equals(type)){
+            response = startAndEnd(currentUserId,userId,true);
+        } else {
+            response = startAndEnd(currentUserId,userId,false);
+        }
+        return response;
+    }
+
+    /**
+     *  用户停用和启用
+     * @param currentUserId 当前用户(业主)
+     * @param userId 租客或者家属
+     * @param bool 启用为 true  停用为 false
+     * @return
+     */
+    private ResponseBean startAndEnd(Integer currentUserId, Integer userId, boolean bool){
+
+        // TODO 更新人字段需要待定
+        /**
+         * 更新人 是业主 还是 物业
+         */
+
+        ResponseBean response = new ResponseBean();
+
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        if (null == user) {
+            response.addError("该用户不存在!");
+            return response;
+        }
+        if (!currentUserId.equals(user.getParentId())) {
+            response.addError("该用户不是您的家属或租客!");
+            return response;
+        }
+        if (bool) {
+            if ("1".equals(user.getStatus())) {
+                response.addError("用户已启用!");
+                return response;
+            }
+            user.setStatus("1");
+        } else {
+            if ("0".equals(user.getStatus())) {
+                response.addError("用户已停用!");
+                return response;
+            }
+            user.setStatus("0");
+        }
+
+        int result = taUserMapper.updateByPrimaryKeySelective(user);
+        if (result > 0) {
+            response.addSuccess(bool==true?"用户启用成功!":"用户停用成功!");
+        } else {
+            response.addError(bool==true?"用户启用失败!":"用户停用失败!");
+        }
+
+        return response;
+    }
+
+    @Transactional
+    @Override
+    public ResponseBean addTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type) {
+        ResponseBean response = new ResponseBean();
+
+        TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
+        if (null == taUser) {
+            response.addError("此用户不存在!");
+            return response;
+        }
+        if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
+            response.addError("对不起,您未认证或认证已作废!");
+            return response;
+        }
+
+        TaUser user = new TaUser();
+        user.setUserName(userName);
+        user.setLoginName(phone);
+        user.setGender(gender);
+        user.setCreateDate(new Date());
+        user.setCreateUser(currentUserId);
+        user.setUpdateDate(new Date());
+        user.setUpdateUser(currentUserId);
+        user.setParentId(currentUserId);
+        user.setStatus("1");
+        user.setVerifyStatus("1");
+        user.setAcceptAgreementStatus("1");
+        user.setRemark("这是业主添加的!");
+        user.setUserName(user.getLoginName());
+        user.setBuildingOwnerInfoId(taUser.getBuildingOwnerInfoId());
+        user.setCommunityId(user.getCommunityId());
+
+        int result = taUserMapper.insertSelective(user);
+        if (result < 0) {
+            response.addError("添加失败!");
+            return response;
+        }
+
+        // 先查询角色 在角色关联记录
+        // 这里的 2 或者 3 是对应角色编号
+        int roleType = type.equals("0") ? 2 : 3;
+        TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(roleType);
+        if (null == taSysRole) {
+            response.addError("该权限不存在!");
+            log.error("这个角色没有找到!角色名称:{} 角色编号:{}",type.equals("0") ? "租客" : "家属",roleType);
+            return response;
+        }
+
+        TaSysUserRole taSysUserRole = new TaSysUserRole();
+        taSysUserRole.setCommunityId(user.getCommunityId());
+        taSysUserRole.setRoleId(taSysRole.getId());
+        taSysUserRole.setUserId(user.getId());
+        try {
+            int resultRole = taSysUserRoleMapper.insertSelective(taSysUserRole);
+            if (resultRole > 0) {
+                response.addSuccess("添加成功!");
+            } else {
+                throw new RuntimeException("租客或者家属角色权限添加失败");
+            }
+        } catch (Exception e) {
+            response.addSuccess("添加失败!");
+            log.error("租客或者家属角色权限添加失败!",e);
+            throw new RuntimeException("租客或者家属角色权限添加失败");
+        }
+
+        return response;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TpTicketMapper;
@@ -40,6 +41,9 @@ public class TicketServiceImpl implements ITicketService {
 
     @Autowired
     private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
+    
+    @Autowired
+    private TaUserMapper taUserMapper;
 
     @Autowired
     private TaUserMapper taUserMapper;
@@ -195,5 +199,24 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecordMapper.insert(tpTicketRecord);
         response.addSuccess("新增成功");
         return response;
+    
+    /**
+     * 回复工单
+     * @param tpTicketRecordComment
+     * @return
+     */
+    @Override
+    public Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment) {
+        Integer userId = 1;
+        //查询用户名
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        
+        tpTicketRecordComment.setUserName(taUser.getUserName());
+        tpTicketRecordComment.setParentId(tpTicketRecordComment.getTicketRecordCommentId());
+        tpTicketRecordComment.setUuid(userId);
+        tpTicketRecordComment.setUserType(Constant.TICKET_USER_TYPE);
+        tpTicketRecordComment.setCreateDate(new Date());
+        //插入回复数据
+        return tpTicketRecordCommentMapper.insertSelective(tpTicketRecordComment);
     }
 }

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -7,6 +7,8 @@ management:
 mybatis:
   typeAliasesPackage: com.community.huiju.model
   mapperLocations: classpath:mapper/*.xml
+  configuration:
+    call-setters-on-nulls: true
 # 分页配置
 pagehelper:
   helper-dialect: mysql

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

@@ -52,7 +52,7 @@
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" >
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.community.huiju.model.TaUser" >
     insert into ta_user
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -0,0 +1,264 @@
+<?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.TpBillInvoiceMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpBillInvoice" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="bill_id" property="billId" jdbcType="INTEGER" />
+    <result column="building_owner_info_id" property="buildingOwnerInfoId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="bill_invoice_explain" property="billInvoiceExplain" jdbcType="VARCHAR" />
+    <result column="pay_price" property="payPrice" jdbcType="INTEGER" />
+    <result column="bill_statement_id" property="billStatementId" jdbcType="INTEGER" />
+    <result column="bill_status" property="billStatus" jdbcType="CHAR" />
+    <result column="pay_name" property="payName" jdbcType="VARCHAR" />
+    <result column="pay_date" property="payDate" jdbcType="TIMESTAMP" />
+    <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, community_id, bill_id, building_owner_info_id, ta_user_id, bill_invoice_explain, 
+    pay_price, bill_statement_id, bill_status, pay_name, pay_date, 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 tp_bill_invoice
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_bill_invoice
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpBillInvoice" >
+    insert into tp_bill_invoice (id, community_id, bill_id, 
+      building_owner_info_id, ta_user_id, bill_invoice_explain, 
+      pay_price, bill_statement_id, bill_status, 
+      pay_name, pay_date, create_user, 
+      create_date, update_user, update_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{billId,jdbcType=INTEGER}, 
+      #{buildingOwnerInfoId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, #{billInvoiceExplain,jdbcType=VARCHAR}, 
+      #{payPrice,jdbcType=INTEGER}, #{billStatementId,jdbcType=INTEGER}, #{billStatus,jdbcType=CHAR}, 
+      #{payName,jdbcType=VARCHAR}, #{payDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillInvoice" >
+    insert into tp_bill_invoice
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="billId != null" >
+        bill_id,
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        building_owner_info_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="billInvoiceExplain != null" >
+        bill_invoice_explain,
+      </if>
+      <if test="payPrice != null" >
+        pay_price,
+      </if>
+      <if test="billStatementId != null" >
+        bill_statement_id,
+      </if>
+      <if test="billStatus != null" >
+        bill_status,
+      </if>
+      <if test="payName != null" >
+        pay_name,
+      </if>
+      <if test="payDate != null" >
+        pay_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="billId != null" >
+        #{billId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        #{buildingOwnerInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="billInvoiceExplain != null" >
+        #{billInvoiceExplain,jdbcType=VARCHAR},
+      </if>
+      <if test="payPrice != null" >
+        #{payPrice,jdbcType=INTEGER},
+      </if>
+      <if test="billStatementId != null" >
+        #{billStatementId,jdbcType=INTEGER},
+      </if>
+      <if test="billStatus != null" >
+        #{billStatus,jdbcType=CHAR},
+      </if>
+      <if test="payName != null" >
+        #{payName,jdbcType=VARCHAR},
+      </if>
+      <if test="payDate != null" >
+        #{payDate,jdbcType=TIMESTAMP},
+      </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.TpBillInvoice" >
+    update tp_bill_invoice
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="billId != null" >
+        bill_id = #{billId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="billInvoiceExplain != null" >
+        bill_invoice_explain = #{billInvoiceExplain,jdbcType=VARCHAR},
+      </if>
+      <if test="payPrice != null" >
+        pay_price = #{payPrice,jdbcType=INTEGER},
+      </if>
+      <if test="billStatementId != null" >
+        bill_statement_id = #{billStatementId,jdbcType=INTEGER},
+      </if>
+      <if test="billStatus != null" >
+        bill_status = #{billStatus,jdbcType=CHAR},
+      </if>
+      <if test="payName != null" >
+        pay_name = #{payName,jdbcType=VARCHAR},
+      </if>
+      <if test="payDate != null" >
+        pay_date = #{payDate,jdbcType=TIMESTAMP},
+      </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.TpBillInvoice" >
+    update tp_bill_invoice
+    set community_id = #{communityId,jdbcType=INTEGER},
+      bill_id = #{billId,jdbcType=INTEGER},
+      building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      bill_invoice_explain = #{billInvoiceExplain,jdbcType=VARCHAR},
+      pay_price = #{payPrice,jdbcType=INTEGER},
+      bill_statement_id = #{billStatementId,jdbcType=INTEGER},
+      bill_status = #{billStatus,jdbcType=CHAR},
+      pay_name = #{payName,jdbcType=VARCHAR},
+      pay_date = #{payDate,jdbcType=TIMESTAMP},
+      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="getBillsList" resultType="map">
+      SELECT
+          i.id,
+          i.bill_invoice_explain as billInvoiceExplain,
+          i.pay_price AS payPrice,
+          i.ta_user_id AS taUserId,
+          i.bill_status AS billStatus,
+          b.bill_name AS billName,
+          b.bill_explain AS billExplain,
+          b.end_date AS endDate
+      FROM
+          tp_bill_invoice i
+          LEFT JOIN tp_bill b ON b.id = i.bill_id
+          AND b.community_id = #{communityId,jdbcType=INTEGER}
+      WHERE
+          i.community_id = #{communityId,jdbcType=INTEGER}
+          <if test="payType == 0">
+            AND i.bill_status = 0
+          </if>
+          <if test="payType == 1">
+            AND (i.bill_status = 1 or i.bill_status = 2)
+          </if>
+          AND i.ta_user_id = #{userId,jdbcType=INTEGER}
+  </select>
+
+  <select id="getBillInvoiceDetail" resultType="map">
+    SELECT
+        i.id,
+        i.bill_invoice_explain AS billInvoiceExplain,
+        i.pay_price AS payPrice,
+        i.ta_user_id AS taUserId,
+        i.bill_status AS billStatus,
+        b.bill_name AS billName,
+        b.bill_explain AS billExplain,
+        b.end_date AS endDate,
+        s.id AS billStatementId,
+        s.pay_name AS payName,
+        s.pay_remark AS payRemark,
+        s.pay_type AS payType,
+        s.create_time AS createTime
+    FROM
+        tp_bill_invoice i
+        LEFT JOIN tp_bill b ON b.id = i.bill_id
+        AND b.community_id = #{communityId,jdbcType=INTEGER}
+        LEFT JOIN tp_bill_statement s ON i.bill_statement_id = s.id
+        AND s.community_id = #{communityId,jdbcType=INTEGER}
+    WHERE
+        i.id = #{billInvoiceId,jdbcType=INTEGER}
+    AND i.community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,199 @@
+<?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.TpBillMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpBill" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="bill_name" property="billName" jdbcType="VARCHAR" />
+    <result column="bill_explain" property="billExplain" jdbcType="VARCHAR" />
+    <result column="pay_price" property="payPrice" jdbcType="CHAR" />
+    <result column="pay_total_num" property="payTotalNum" jdbcType="INTEGER" />
+    <result column="payed_num" property="payedNum" jdbcType="INTEGER" />
+    <result column="unpayed_num" property="unpayedNum" jdbcType="INTEGER" />
+    <result column="bill_status" property="billStatus" jdbcType="CHAR" />
+    <result column="end_date" property="endDate" jdbcType="TIMESTAMP" />
+    <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, community_id, bill_name, bill_explain, pay_price, pay_total_num, payed_num, unpayed_num, 
+    bill_status, end_date, 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 tp_bill
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_bill
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpBill" >
+    insert into tp_bill (id, community_id, bill_name, 
+      bill_explain, pay_price, pay_total_num, 
+      payed_num, unpayed_num, bill_status, 
+      end_date, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{billName,jdbcType=VARCHAR}, 
+      #{billExplain,jdbcType=VARCHAR}, #{payPrice,jdbcType=CHAR}, #{payTotalNum,jdbcType=INTEGER}, 
+      #{payedNum,jdbcType=INTEGER}, #{unpayedNum,jdbcType=INTEGER}, #{billStatus,jdbcType=CHAR}, 
+      #{endDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBill" >
+    insert into tp_bill
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="billName != null" >
+        bill_name,
+      </if>
+      <if test="billExplain != null" >
+        bill_explain,
+      </if>
+      <if test="payPrice != null" >
+        pay_price,
+      </if>
+      <if test="payTotalNum != null" >
+        pay_total_num,
+      </if>
+      <if test="payedNum != null" >
+        payed_num,
+      </if>
+      <if test="unpayedNum != null" >
+        unpayed_num,
+      </if>
+      <if test="billStatus != null" >
+        bill_status,
+      </if>
+      <if test="endDate != null" >
+        end_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="billName != null" >
+        #{billName,jdbcType=VARCHAR},
+      </if>
+      <if test="billExplain != null" >
+        #{billExplain,jdbcType=VARCHAR},
+      </if>
+      <if test="payPrice != null" >
+        #{payPrice,jdbcType=CHAR},
+      </if>
+      <if test="payTotalNum != null" >
+        #{payTotalNum,jdbcType=INTEGER},
+      </if>
+      <if test="payedNum != null" >
+        #{payedNum,jdbcType=INTEGER},
+      </if>
+      <if test="unpayedNum != null" >
+        #{unpayedNum,jdbcType=INTEGER},
+      </if>
+      <if test="billStatus != null" >
+        #{billStatus,jdbcType=CHAR},
+      </if>
+      <if test="endDate != null" >
+        #{endDate,jdbcType=TIMESTAMP},
+      </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.TpBill" >
+    update tp_bill
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="billName != null" >
+        bill_name = #{billName,jdbcType=VARCHAR},
+      </if>
+      <if test="billExplain != null" >
+        bill_explain = #{billExplain,jdbcType=VARCHAR},
+      </if>
+      <if test="payPrice != null" >
+        pay_price = #{payPrice,jdbcType=CHAR},
+      </if>
+      <if test="payTotalNum != null" >
+        pay_total_num = #{payTotalNum,jdbcType=INTEGER},
+      </if>
+      <if test="payedNum != null" >
+        payed_num = #{payedNum,jdbcType=INTEGER},
+      </if>
+      <if test="unpayedNum != null" >
+        unpayed_num = #{unpayedNum,jdbcType=INTEGER},
+      </if>
+      <if test="billStatus != null" >
+        bill_status = #{billStatus,jdbcType=CHAR},
+      </if>
+      <if test="endDate != null" >
+        end_date = #{endDate,jdbcType=TIMESTAMP},
+      </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.TpBill" >
+    update tp_bill
+    set community_id = #{communityId,jdbcType=INTEGER},
+      bill_name = #{billName,jdbcType=VARCHAR},
+      bill_explain = #{billExplain,jdbcType=VARCHAR},
+      pay_price = #{payPrice,jdbcType=CHAR},
+      pay_total_num = #{payTotalNum,jdbcType=INTEGER},
+      payed_num = #{payedNum,jdbcType=INTEGER},
+      unpayed_num = #{unpayedNum,jdbcType=INTEGER},
+      bill_status = #{billStatus,jdbcType=CHAR},
+      end_date = #{endDate,jdbcType=TIMESTAMP},
+      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>
+</mapper>

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

@@ -0,0 +1,142 @@
+<?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.TpBillStatementMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpBillStatement" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="bill_invoice_id" property="billInvoiceId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="pay_price" property="payPrice" jdbcType="INTEGER" />
+    <result column="pay_name" property="payName" jdbcType="VARCHAR" />
+    <result column="pay_remark" property="payRemark" jdbcType="VARCHAR" />
+    <result column="pay_type" property="payType" jdbcType="CHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, bill_invoice_id, ta_user_id, pay_price, pay_name, pay_remark, pay_type, 
+    create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_bill_statement
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_bill_statement
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpBillStatement" >
+    insert into tp_bill_statement (id, community_id, bill_invoice_id, 
+      ta_user_id, pay_price, pay_name, 
+      pay_remark, pay_type, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{billInvoiceId,jdbcType=INTEGER}, 
+      #{taUserId,jdbcType=INTEGER}, #{payPrice,jdbcType=INTEGER}, #{payName,jdbcType=VARCHAR}, 
+      #{payRemark,jdbcType=VARCHAR}, #{payType,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillStatement" >
+    insert into tp_bill_statement
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="billInvoiceId != null" >
+        bill_invoice_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="payPrice != null" >
+        pay_price,
+      </if>
+      <if test="payName != null" >
+        pay_name,
+      </if>
+      <if test="payRemark != null" >
+        pay_remark,
+      </if>
+      <if test="payType != null" >
+        pay_type,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </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="billInvoiceId != null" >
+        #{billInvoiceId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="payPrice != null" >
+        #{payPrice,jdbcType=INTEGER},
+      </if>
+      <if test="payName != null" >
+        #{payName,jdbcType=VARCHAR},
+      </if>
+      <if test="payRemark != null" >
+        #{payRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="payType != null" >
+        #{payType,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpBillStatement" >
+    update tp_bill_statement
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="billInvoiceId != null" >
+        bill_invoice_id = #{billInvoiceId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="payPrice != null" >
+        pay_price = #{payPrice,jdbcType=INTEGER},
+      </if>
+      <if test="payName != null" >
+        pay_name = #{payName,jdbcType=VARCHAR},
+      </if>
+      <if test="payRemark != null" >
+        pay_remark = #{payRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="payType != null" >
+        pay_type = #{payType,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpBillStatement" >
+    update tp_bill_statement
+    set community_id = #{communityId,jdbcType=INTEGER},
+      bill_invoice_id = #{billInvoiceId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      pay_price = #{payPrice,jdbcType=INTEGER},
+      pay_name = #{payName,jdbcType=VARCHAR},
+      pay_remark = #{payRemark,jdbcType=VARCHAR},
+      pay_type = #{payType,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,223 @@
+<?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.TpBuildingOwnerInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpBuildingOwnerInfo" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="id_card" property="idCard" jdbcType="VARCHAR" />
+    <result column="building" property="building" jdbcType="VARCHAR" />
+    <result column="unit" property="unit" jdbcType="VARCHAR" />
+    <result column="level" property="level" jdbcType="VARCHAR" />
+    <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
+    <result column="owner_name" property="ownerName" jdbcType="VARCHAR" />
+    <result column="owner_tel" property="ownerTel" jdbcType="VARCHAR" />
+    <result column="gender" property="gender" jdbcType="CHAR" />
+    <result column="pair_status" property="pairStatus" jdbcType="CHAR" />
+    <result column="verify_status" property="verifyStatus" jdbcType="CHAR" />
+    <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, community_id, id_card, building, unit, level, room_no, owner_name, owner_tel, 
+    gender, pair_status, verify_status, 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 tp_building_owner_info
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_building_owner_info
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
+    insert into tp_building_owner_info (id, community_id, id_card, 
+      building, unit, level, 
+      room_no, owner_name, owner_tel, 
+      gender, pair_status, verify_status, 
+      create_user, create_date, update_user, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
+      #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, 
+      #{roomNo,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR}, #{ownerTel,jdbcType=VARCHAR}, 
+      #{gender,jdbcType=CHAR}, #{pairStatus,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.TpBuildingOwnerInfo" >
+    insert into tp_building_owner_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="idCard != null" >
+        id_card,
+      </if>
+      <if test="building != null" >
+        building,
+      </if>
+      <if test="unit != null" >
+        unit,
+      </if>
+      <if test="level != null" >
+        level,
+      </if>
+      <if test="roomNo != null" >
+        room_no,
+      </if>
+      <if test="ownerName != null" >
+        owner_name,
+      </if>
+      <if test="ownerTel != null" >
+        owner_tel,
+      </if>
+      <if test="gender != null" >
+        gender,
+      </if>
+      <if test="pairStatus != null" >
+        pair_status,
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="idCard != null" >
+        #{idCard,jdbcType=VARCHAR},
+      </if>
+      <if test="building != null" >
+        #{building,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="roomNo != null" >
+        #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerName != null" >
+        #{ownerName,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerTel != null" >
+        #{ownerTel,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        #{gender,jdbcType=CHAR},
+      </if>
+      <if test="pairStatus != null" >
+        #{pairStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        #{verifyStatus,jdbcType=CHAR},
+      </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.TpBuildingOwnerInfo" >
+    update tp_building_owner_info
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="idCard != null" >
+        id_card = #{idCard,jdbcType=VARCHAR},
+      </if>
+      <if test="building != null" >
+        building = #{building,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        unit = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        level = #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="roomNo != null" >
+        room_no = #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerName != null" >
+        owner_name = #{ownerName,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerTel != null" >
+        owner_tel = #{ownerTel,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        gender = #{gender,jdbcType=CHAR},
+      </if>
+      <if test="pairStatus != null" >
+        pair_status = #{pairStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status = #{verifyStatus,jdbcType=CHAR},
+      </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.TpBuildingOwnerInfo" >
+    update tp_building_owner_info
+    set community_id = #{communityId,jdbcType=INTEGER},
+      id_card = #{idCard,jdbcType=VARCHAR},
+      building = #{building,jdbcType=VARCHAR},
+      unit = #{unit,jdbcType=VARCHAR},
+      level = #{level,jdbcType=VARCHAR},
+      room_no = #{roomNo,jdbcType=VARCHAR},
+      owner_name = #{ownerName,jdbcType=VARCHAR},
+      owner_tel = #{ownerTel,jdbcType=VARCHAR},
+      gender = #{gender,jdbcType=CHAR},
+      pair_status = #{pairStatus,jdbcType=CHAR},
+      verify_status = #{verifyStatus,jdbcType=CHAR},
+      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>
+</mapper>

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

@@ -59,4 +59,7 @@ public class Constant {
 
     /**家属角色**/
     public static final String FAMILYMEMBER = "familyMember";
+    
+    /** 工单回复的发起人 **/
+    public static final String TICKET_USER_TYPE = "1";
 }