Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -19,6 +19,8 @@ import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -40,6 +42,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "微信人员相关API", tags = "微信人员相关API")
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
@@ -420,6 +423,7 @@ public class TaPersonController extends BaseController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "人员签到", notes = "人员签到")
     @PostMapping("/wx/user/signin")
     public ResponseBean userSign(HttpServletRequest request) {
         String openid = getOpenId(request);

src/main/java/com/huiju/estateagents/property/model/TpSocialView.java

@@ -1,11 +1,14 @@
 package com.huiju.estateagents.property.model;
 
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class TpSocialView {
     private Integer id;
 
-    private Integer communityId;
+    private Integer orgId;
 
     private Integer uuid;
 
@@ -16,60 +19,4 @@ public class TpSocialView {
     private String remark;
 
     private Date createDate;
-
-    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 getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(Integer uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getSocialType() {
-        return socialType;
-    }
-
-    public void setSocialType(String socialType) {
-        this.socialType = socialType == null ? null : socialType.trim();
-    }
-
-    public Integer getTaUserId() {
-        return taUserId;
-    }
-
-    public void setTaUserId(Integer taUserId) {
-        this.taUserId = taUserId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
 }

src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java

@@ -101,7 +101,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpSocialView tpSocialView = new TpSocialView();
         tpSocialView.setTaUserId(userId);
         tpSocialView.setSocialType(socialType);
-        tpSocialView.setCommunityId(orgId);
+        tpSocialView.setOrgId(orgId);
         tpSocialView.setUuid(uuid);
         Integer viewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
 

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

@@ -22,10 +22,6 @@ import java.util.Map;
 @Data
 public class TpTicketVO extends TpTicket {
 
-    /** 小区编号 **/
-    private Integer communityId;
-
-
     /**
      * 报修类型的名字
      */

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -101,4 +101,21 @@
     a.update_date DESC,
     a.create_date DESC
   </select>
+
+  <update id="updateByPrimaryKeySelective" >
+    update tp_announcement
+    <set >
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByPrimaryKey" resultType="com.huiju.estateagents.property.model.TpAnnouncement">
+    select
+    <include refid="Base_Column_List" />
+    from tp_announcement
+    where id = #{id,jdbcType=INTEGER} and org_id = #{orgId,jdbcType=INTEGER}
+  </select>
 </mapper>

src/main/resources/mapper/property/TpSocialViewMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.TpSocialViewMapper" >
   <resultMap id="BaseResultMap" type="com.huiju.estateagents.property.model.TpSocialView" >
     <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
     <result column="uuid" property="uuid" jdbcType="INTEGER" />
     <result column="social_type" property="socialType" jdbcType="VARCHAR" />
     <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
@@ -11,7 +11,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, uuid, social_type, ta_user_id, remark, create_date
+    id, org_id, uuid, social_type, ta_user_id, remark, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -37,8 +37,8 @@
       <if test="id != null" >
         id,
       </if>
-      <if test="communityId != null" >
-        community_id,
+      <if test="orgId != null" >
+        org_id,
       </if>
       <if test="uuid != null" >
         uuid,
@@ -60,8 +60,8 @@
       <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="communityId != null" >
-        #{communityId,jdbcType=INTEGER},
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
       </if>
       <if test="uuid != null" >
         #{uuid,jdbcType=INTEGER},
@@ -122,7 +122,7 @@
       and ta_user_id = #{taUserId}
     </if>
     and uuid = #{uuid}
-    and community_id = #{communityId}
+    and org_id = #{orgId}
     and social_type = #{socialType}
   </select>
 </mapper>

src/main/resources/mapper/property/TpTicketRecordMapper.xml

@@ -45,7 +45,7 @@
         t.id,
         t.status,
         t.ticket_id AS ticketId,
-        t.community_id AS communityId,
+        t.org_id AS orgId,
         t.content AS content,
         t.create_date AS createDate,
         d.NAME AS ticketStatusName
@@ -54,7 +54,7 @@
         LEFT JOIN sys_dictionary d ON t.STATUS = d.CODE
         AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
     WHERE
-        community_id = #{communityId,jdbcType=INTEGER}
+        org_id = #{orgId,jdbcType=INTEGER}
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
     order by t.status
   </select>