暂存

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

@@ -42,4 +42,13 @@ public class AgreementController {
         return responseBean;
     }
 
+    @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
+    @RequestMapping(value = "/allTpAnnouncementTel",method = RequestMethod.GET)
+    public ResponseBean getTpAnnouncementTel(){
+        ResponseBean responseBean = new ResponseBean();
+        ResponseBean agreement = agreementService.getTpAnnouncementTel();
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
 }

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

@@ -155,5 +155,47 @@ public class SocialController {
         return responseBean;
     }
 
+    @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "transactionTitle",value = "交易标题"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "transactionContent",value = "交易内容"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type",value = "0:二手 1:求购  2:租赁"),
+    })
+    @RequestMapping(value = "/addAllTransaction",method = RequestMethod.POST)
+    public ResponseBean addTransaction(TpTransaction tpTransaction, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId=userElement.getId();
+        ResponseBean response=socialServiceI.addAllTransaction(userId,tpTransaction);
+        return response;
+    }
+
+    @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/selectAllTransaction",method = RequestMethod.POST)
+    public ResponseBean selectAllTransaction( HttpSession session,
+                                              @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId=userElement.getId();
+        ResponseBean response=socialServiceI.selectAllTransaction(userId,pageNum, pageSize);
+        return response;
+    }
 
+    @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "二手租赁帖子Id")
+    })
+    @RequestMapping(value = "/ubDateAllTransaction",method = RequestMethod.PUT)
+    public ResponseBean ubdateTransaction( HttpSession session, TpTransaction tpTransaction){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId=userElement.getId();
+        ResponseBean response=socialServiceI.ubdateTransaction(tpTransaction,userId);
+        return response;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.community.commom.mode.ResponseBean;
 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.service.ITicketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -91,4 +92,21 @@ public class TicketController {
 
     }
 
+    @ApiOperation(value = "添加报修", notes = "添加报修")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketContent",value = "工单内容"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketTitle",value = "工单标题"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "repairType",value = "报修房屋类型"),
+    })
+    @RequestMapping(value = "/addAlltpTicket",method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean addTransaction(TpTicket tpTicket, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId=userElement.getId();
+        ResponseBean response=iTicketService.addAiTicketService(userId,tpTicket);
+        return response;
+    }
+
+
 }

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.User;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -62,11 +63,11 @@ public class UserController {
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码")
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
-    public ResponseBean update(@RequestParam(value = "phone") String phone,@RequestParam(value = "code")String code,HttpSession session){
+    public ResponseBean update(@RequestBody String paramets, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId=userElement.getId();
-        ResponseBean response=iTaUserService.selectloginName(userId,phone,code);
+        ResponseBean response=iTaUserService.udDateloginName(userId,paramets);
         return response;
     }
 

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

@@ -35,4 +35,11 @@ public interface TpTicketMapper {
      * @return
      */
 	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
+
+    /**
+     * 获取当前插入的信息
+     * @param userId
+     * @param communityId
+     */
+    TpTicket getById(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
 }

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

@@ -21,4 +21,6 @@ public interface TpTransactionMapper {
     int updateByPrimaryKey(TpTransaction record);
 
     List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("type") String type);
+
+    List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
 }

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

@@ -0,0 +1,11 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpannouncementTel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+@Mapper
+public interface TpannouncementTelMapper {
+    List<TpannouncementTel> getTpannouncementTel();
+}

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

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import org.apache.ibatis.annotations.Mapper;
+
 import java.util.Date;
 
 public class TpTicketRecordComment {

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

@@ -13,16 +13,6 @@ public class TpTransaction {
 
     private String transactionContent;
 
-    private String transactionMatchImg1;
-
-    private String activityMatchImg3;
-
-    private String activityMatchImg4;
-
-    private String activityMatchImg5;
-
-    private String activityMatchImg6;
-
     private Integer viewCount;
 
     private String status;
@@ -76,47 +66,6 @@ public class TpTransaction {
     public void setTransactionContent(String transactionContent) {
         this.transactionContent = transactionContent == null ? null : transactionContent.trim();
     }
-
-    public String getTransactionMatchImg1() {
-        return transactionMatchImg1;
-    }
-
-    public void setTransactionMatchImg1(String transactionMatchImg1) {
-        this.transactionMatchImg1 = transactionMatchImg1 == null ? null : transactionMatchImg1.trim();
-    }
-
-    public String getActivityMatchImg3() {
-        return activityMatchImg3;
-    }
-
-    public void setActivityMatchImg3(String activityMatchImg3) {
-        this.activityMatchImg3 = activityMatchImg3 == null ? null : activityMatchImg3.trim();
-    }
-
-    public String getActivityMatchImg4() {
-        return activityMatchImg4;
-    }
-
-    public void setActivityMatchImg4(String activityMatchImg4) {
-        this.activityMatchImg4 = activityMatchImg4 == null ? null : activityMatchImg4.trim();
-    }
-
-    public String getActivityMatchImg5() {
-        return activityMatchImg5;
-    }
-
-    public void setActivityMatchImg5(String activityMatchImg5) {
-        this.activityMatchImg5 = activityMatchImg5 == null ? null : activityMatchImg5.trim();
-    }
-
-    public String getActivityMatchImg6() {
-        return activityMatchImg6;
-    }
-
-    public void setActivityMatchImg6(String activityMatchImg6) {
-        this.activityMatchImg6 = activityMatchImg6 == null ? null : activityMatchImg6.trim();
-    }
-
     public Integer getViewCount() {
         return viewCount;
     }

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

@@ -0,0 +1,54 @@
+package com.community.huiju.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpannouncementTel {
+
+    private Integer Id;
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 电话名称
+     */
+    private String name;
+
+    /**
+     * 电话
+     */
+    private String tel;
+
+    /***
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+}

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaAgreement;
 
 import java.util.List;
@@ -26,4 +27,10 @@ public interface AgreementServicel {
     int updateByPrimaryKey(TaAgreement record);
 
     TaAgreement getAgreement();
+
+    /**
+     * 物业电话/门卫电话/领导电话
+     * @return
+     */
+    ResponseBean getTpAnnouncementTel();
 }

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

@@ -33,11 +33,11 @@ public interface ITaUserService {
     ResponseBean register(TaUser user);
 
     /**
-     * 查询当前用户信息
+     * 修改当前用户信息
      * @param id
      * @return
      */
-    ResponseBean selectloginName(Integer id, String phone, String code);
+    ResponseBean udDateloginName(Integer id, String paramets);
 
 
 

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

@@ -37,4 +37,13 @@ public interface ITicketService {
 	 * @return
 	 */
 	TpTicket getTicketSchedule(String communityId, Integer ticketId);
+
+
+	/**
+	 * 添加报修
+	 * @param userId
+	 * @param tpTicket
+	 * @return
+	 */
+    ResponseBean addAiTicketService(Integer userId, TpTicket tpTicket);
 }

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

@@ -80,4 +80,24 @@ public interface SocialServiceI {
 	 * @param tpTicket
 	 */
 	void updateTicketContent(Integer ticketId, TpTicket tpTicket);
+
+	/**
+	 * 添加二手租赁帖子
+	 */
+    ResponseBean addAllTransaction(Integer userId,  TpTransaction Transaction);
+
+	/**
+	 * 获取当前用户所有的帖子
+	 * @param userId
+	 * @return
+	 */
+	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize);
+
+	/**
+	 * 修改当前帖子
+	 * @param tpTransaction
+	 * @param userId
+	 * @return
+	 */
+	ResponseBean ubdateTransaction(TpTransaction tpTransaction,Integer userId);
 }

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

@@ -1,12 +1,18 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TaAgreementMapper;
+import com.community.huiju.dao.TpannouncementTelMapper;
 import com.community.huiju.model.TaAgreement;
+import com.community.huiju.model.TpannouncementTel;
 import com.community.huiju.service.AgreementServicel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service("agreementService")
 public class AgreementServiceimpl implements AgreementServicel {
@@ -14,6 +20,9 @@ public class AgreementServiceimpl implements AgreementServicel {
     @Autowired
     private TaAgreementMapper agreementMapper;
 
+    @Autowired
+    private TpannouncementTelMapper tpannouncementTelMapper;
+
     @Override
     public int deleteByPrimaryKey(Integer id) {
         return agreementMapper.deleteByPrimaryKey(id);
@@ -45,11 +54,18 @@ public class AgreementServiceimpl implements AgreementServicel {
     }
 
     /**
-     *
      * @return
      */
     @Override
     public TaAgreement getAgreement() {
         return agreementMapper.getAgreement();
     }
-}
+
+    @Override
+    public ResponseBean getTpAnnouncementTel() {
+        ResponseBean responseBody = new ResponseBean();
+        List<TpannouncementTel> tt = tpannouncementTelMapper.getTpannouncementTel();
+        responseBody.addSuccess(tt);
+        return responseBody;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.*;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -248,6 +250,48 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
     }
 
+    @Override
+    public ResponseBean addAllTransaction(Integer userId, TpTransaction tpTransaction) {
+        ResponseBean response = new ResponseBean();
+        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        tpTransaction.setCommunityId(user.getCommunityId());
+        tpTransaction.setTaUserId(userId);
+        tpTransaction.setCreateUser(userId);
+        tpTransaction.setCreateDate(new Date());
+        tpTransaction.setUpdateUser(userId);
+        tpTransaction.setUpdateDate(new Date());
+        tpTransactionMapper.insert(tpTransaction);
+        response.addSuccess("发布成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize) {
+        PageHelper.startPage(pageNum, paeSize);
+        ResponseBean responseBean = new ResponseBean();
+        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+         Integer communityId=user.getCommunityId();
+        List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId);
+        responseBean.addSuccess(tpTransactions);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean ubdateTransaction(TpTransaction tpTransaction,Integer userId) {
+        ResponseBean response = new ResponseBean();
+        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        tpTransaction.setCommunityId(user.getCommunityId());
+        tpTransaction.setTaUserId(userId);
+        tpTransaction.setCreateUser(userId);
+        tpTransaction.setStatus("2");
+        tpTransaction.setCreateDate(new Date());
+        tpTransaction.setUpdateUser(userId);
+        tpTransaction.setUpdateDate(new Date());
+        tpTransactionMapper.updateByPrimaryKey(tpTransaction);
+        response.addSuccess("修改成功");
+        return response;
+    }
+
     public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId){
         ResponseBean responseBean = new ResponseBean();
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
@@ -259,7 +303,7 @@ public class SocialServiceImpl implements SocialServiceI {
         responseBean.addSuccess("报名成功");
         return responseBean;
     }
-
+    @Transactional
     @Override
     public TpTransaction findUsedDetails(Integer activityId, Integer communityId, Integer userId) {
         Integer num = updateSocialView(userId,Constant.LEASE,communityId,activityId);

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
@@ -137,13 +138,18 @@ public class TaUserServiceImpl implements ITaUserService {
         response.addSuccess(taUserVO);
         return response;
     }
-
+    @Transactional
     @Override
-    public ResponseBean selectloginName(Integer id, String phone, String code) {
+    public ResponseBean udDateloginName(Integer id, String paramets) {
         ResponseBean response = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        String phone = (String) jsonObject.get("phone");
+        String code = (String) jsonObject.get("code");
+
         TaUser user=taUserMapper.selectByPrimaryKey(id);
         //系统验证码
-        String  codes= (String) AppkeyCache.getCache(user.getLoginName());
+        String  codes= (String) AppkeyCache.getCache(phone);
         //用户电话
             /*String  phones=user.getLoginName();*/
         if(codes.equals(code)){

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

@@ -2,9 +2,11 @@ package com.community.huiju.service.impl;
 
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TpTicketMapper;
 import com.community.huiju.dao.TpTicketRecordCommentMapper;
 import com.community.huiju.dao.TpTicketRecordMapper;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
@@ -18,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -38,6 +41,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket,Integer pageNum, Integer pageSize) {
 
@@ -166,4 +172,28 @@ public class TicketServiceImpl implements ITicketService {
         }
         return ticket;
     }
+
+    @Override
+    public ResponseBean addAiTicketService(Integer userId, TpTicket tpTicket) {
+        ResponseBean response = new ResponseBean();
+        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        tpTicket.setCommunityId(user.getCommunityId());
+        tpTicket.setTaUserId(userId);
+        tpTicket.setTpUserId(userId);
+        tpTicket.setCreateUser(userId);
+        tpTicket.setCreateDate(new Date());
+        tpTicket.setUpdateUser(userId);
+        tpTicket.setUpdateDate(new Date());
+        tpTicketMapper.insert(tpTicket);
+        TpTicketRecord  tpTicketRecord=new TpTicketRecord();
+        //获取当前插入的信息，维护工单记录表
+        TpTicket tpTicketReco=tpTicketMapper.getById(userId,user.getCommunityId());
+        tpTicketRecord.setCommunityId(user.getCommunityId());
+        tpTicketRecord.setTicketId(tpTicketReco.getId());
+        tpTicketRecord.setCreateUser(userId);
+        tpTicketRecord.setCreateDate(new Date());
+        tpTicketRecordMapper.insert(tpTicketRecord);
+        response.addSuccess("新增成功");
+        return response;
+    }
 }

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

@@ -247,4 +247,15 @@
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
   </select>
+
+  <select id="getById" resultMap="BaseResultMap" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM
+    tp_ticket
+    WHERE
+     ta_user_id = #{userId,jdbcType=INTEGER}
+    AND community_id = #{communityId,jdbcType=INTEGER} order by update_date desc  limit 1
+  </select>
+
 </mapper>

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

@@ -7,11 +7,6 @@
     <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
     <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR" />
     <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR" />
-    <result column="transaction_match_img1" property="transactionMatchImg1" jdbcType="VARCHAR" />
-    <result column="activity_match_img3" property="activityMatchImg3" jdbcType="VARCHAR" />
-    <result column="activity_match_img4" property="activityMatchImg4" jdbcType="VARCHAR" />
-    <result column="activity_match_img5" property="activityMatchImg5" jdbcType="VARCHAR" />
-    <result column="activity_match_img6" property="activityMatchImg6" jdbcType="VARCHAR" />
     <result column="view_count" property="viewCount" jdbcType="INTEGER" />
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="type" property="type" jdbcType="CHAR" />
@@ -21,8 +16,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ta_user_id, transaction_title, transaction_content, transaction_match_img1, 
-    activity_match_img3, activity_match_img4, activity_match_img5, activity_match_img6, 
+    id, community_id, ta_user_id, transaction_title, transaction_content,
     view_count, status, type, create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -37,15 +31,13 @@
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransaction" >
     insert into tp_transaction (id, community_id, ta_user_id, 
-      transaction_title, transaction_content, transaction_match_img1, 
-      activity_match_img3, activity_match_img4, activity_match_img5, 
-      activity_match_img6, view_count, status, 
+      transaction_title, transaction_content,
+      view_count, status,
       type, create_user, create_date, 
       update_user, update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
-      #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR}, #{transactionMatchImg1,jdbcType=VARCHAR}, 
-      #{activityMatchImg3,jdbcType=VARCHAR}, #{activityMatchImg4,jdbcType=VARCHAR}, #{activityMatchImg5,jdbcType=VARCHAR}, 
-      #{activityMatchImg6,jdbcType=VARCHAR}, #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR}, 
+      #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR},
+       #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR},
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
@@ -67,21 +59,6 @@
       <if test="transactionContent != null" >
         transaction_content,
       </if>
-      <if test="transactionMatchImg1 != null" >
-        transaction_match_img1,
-      </if>
-      <if test="activityMatchImg3 != null" >
-        activity_match_img3,
-      </if>
-      <if test="activityMatchImg4 != null" >
-        activity_match_img4,
-      </if>
-      <if test="activityMatchImg5 != null" >
-        activity_match_img5,
-      </if>
-      <if test="activityMatchImg6 != null" >
-        activity_match_img6,
-      </if>
       <if test="viewCount != null" >
         view_count,
       </if>
@@ -120,21 +97,6 @@
       <if test="transactionContent != null" >
         #{transactionContent,jdbcType=VARCHAR},
       </if>
-      <if test="transactionMatchImg1 != null" >
-        #{transactionMatchImg1,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg3 != null" >
-        #{activityMatchImg3,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg4 != null" >
-        #{activityMatchImg4,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg5 != null" >
-        #{activityMatchImg5,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg6 != null" >
-        #{activityMatchImg6,jdbcType=VARCHAR},
-      </if>
       <if test="viewCount != null" >
         #{viewCount,jdbcType=INTEGER},
       </if>
@@ -173,21 +135,6 @@
       <if test="transactionContent != null" >
         transaction_content = #{transactionContent,jdbcType=VARCHAR},
       </if>
-      <if test="transactionMatchImg1 != null" >
-        transaction_match_img1 = #{transactionMatchImg1,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg3 != null" >
-        activity_match_img3 = #{activityMatchImg3,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg4 != null" >
-        activity_match_img4 = #{activityMatchImg4,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg5 != null" >
-        activity_match_img5 = #{activityMatchImg5,jdbcType=VARCHAR},
-      </if>
-      <if test="activityMatchImg6 != null" >
-        activity_match_img6 = #{activityMatchImg6,jdbcType=VARCHAR},
-      </if>
       <if test="viewCount != null" >
         view_count = #{viewCount,jdbcType=INTEGER},
       </if>
@@ -218,11 +165,6 @@
       ta_user_id = #{taUserId,jdbcType=INTEGER},
       transaction_title = #{transactionTitle,jdbcType=VARCHAR},
       transaction_content = #{transactionContent,jdbcType=VARCHAR},
-      transaction_match_img1 = #{transactionMatchImg1,jdbcType=VARCHAR},
-      activity_match_img3 = #{activityMatchImg3,jdbcType=VARCHAR},
-      activity_match_img4 = #{activityMatchImg4,jdbcType=VARCHAR},
-      activity_match_img5 = #{activityMatchImg5,jdbcType=VARCHAR},
-      activity_match_img6 = #{activityMatchImg6,jdbcType=VARCHAR},
       view_count = #{viewCount,jdbcType=INTEGER},
       status = #{status,jdbcType=CHAR},
       type = #{type,jdbcType=CHAR},
@@ -239,4 +181,11 @@
     from tp_transaction
     where community_id = #{communityId,jdbcType=INTEGER} and type = #{type,jdbcType=VARCHAR}
   </select>
+
+  <select id="selectTransaction" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tp_transaction
+    where community_id = #{communityId,jdbcType=INTEGER} and ta_user_id = #{userId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -0,0 +1,25 @@
+<?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.TpannouncementTelMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpannouncementTel" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="tel" property="tel" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id,name,tel,remark,create_user,create_date,update_user,update_date
+  </sql>
+  <select id="getTpannouncementTel" resultMap="BaseResultMap" resultType="map">
+    select
+    <include refid="Base_Column_List" />
+    from tp_announcement_tel
+
+
+  </select>
+</mapper>