解决冲突

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

@@ -146,12 +146,13 @@ public class SocialController {
     }
 
     @ApiOperation(value = "修改报修内容", notes = "修改报修内容")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "小区Id"),
-                         @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType ="TpTicket")})
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
+                         @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType ="TpTicket"),
+                         @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型")})
     @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
-    public ResponseBean updateTicketContent(@PathVariable("ticketId")Integer ticketId, @RequestBody TpTicket tpTicket){
+    public ResponseBean updateTicketContent(@PathVariable("ticketId")Integer ticketId, @RequestBody TpTicket tpTicket, @RequestParam("type")String type){
         ResponseBean responseBean = new ResponseBean();
-        socialServiceI.updateTicketContent(ticketId, tpTicket);
+        socialServiceI.updateTicketContent(ticketId, tpTicket, type);
         return responseBean;
     }
 
@@ -197,5 +198,15 @@ public class SocialController {
         Integer userId=userElement.getId();
         ResponseBean response=socialServiceI.ubdateTransaction(tpTransaction,userId);
         return response;
+
+    @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType ="TpTicket"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id")})
+    @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
+    public ResponseBean accessTicket(@PathVariable("communityId")Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId")String ticketId){
+        ResponseBean responseBean = new ResponseBean();
+        socialServiceI.accessTicket(communityId, tpTicket, ticketId);
+        return responseBean;
     }
 }

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

@@ -6,6 +6,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpTicket;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.vo.TaUserVO;
 import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 import javax.xml.crypto.dsig.keyinfo.PGPData;
+import java.util.List;
 
 /**
  * 用户控制器
@@ -72,6 +74,15 @@ public class UserController {
         return response;
     }
 
+    @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
+    @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
+    public ResponseBean accessTicket(){
+        ResponseBean responseBean = new ResponseBean();
+        //todo
+        List<TaUser> taUserList = iTaUserService.getAllRoomUserList(1);
+        responseBean.addSuccess(taUserList);
+        return responseBean;
+    }
     @ApiOperation(value = "修改用户名和性别", notes = "修改用户名和性别")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "userName",value = "用户民"),

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

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TaUser;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -39,4 +40,11 @@ public interface TaUserMapper {
      * @return
      */
     TaUser ubdateLongName(TaUser record);
+
+    /**
+     * 查询房屋成员列表
+     * @param parentId
+     * @return
+     */
+    List<TaUser> selectUserListByParentId(Integer parentId);
 }

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

@@ -20,4 +20,6 @@ public interface TpActivitySignupMapper {
     int updateByPrimaryKey(TpActivitySignup record);
 
     Integer sumActivitySignUpNum(@Param("id")Integer id, @Param("communityId")Integer communityId);
+
+    Integer findTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
 }

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

@@ -3,6 +3,8 @@ package com.community.huiju.service;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaUser;
 
+import java.util.List;
+
 /**
  * 用户业务 接口
  * @author weiximei
@@ -39,6 +41,12 @@ public interface ITaUserService {
      */
     ResponseBean udDateloginName(Integer id, String paramets);
 
+    /**
+     * 获取房屋成员列表
+     * @param parentId
+     * @return
+     */
+    List<TaUser> getAllRoomUserList(Integer parentId);
 
     /**
      * 修改用户

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

@@ -100,4 +100,13 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean ubdateTransaction(TpTransaction tpTransaction,Integer userId);
+	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type);
+
+	/**
+	 * 评价工单以及评分
+	 * @param communityId
+	 * @param tpTicket
+	 * @param ticketId
+	 */
+	void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId);
 }

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

@@ -7,6 +7,7 @@ import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
+import com.netflix.discovery.converters.Auto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +42,7 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpTransactionMapper tpTransactionMapper;
 
+    @Autowired
     private TaSysRoleMapper taSysRoleMapper;
 
     @Autowired
@@ -245,8 +247,9 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public void updateTicketContent(Integer ticketId, TpTicket tpTicket) {
+    public void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type) {
         tpTicket.setId(ticketId);
+        tpTicket.setType(type);
         tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
     }
 
@@ -290,10 +293,33 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionMapper.updateByPrimaryKey(tpTransaction);
         response.addSuccess("修改成功");
         return response;
+    public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId) {
+        //修改工单内容和评分
+        tpTicket.setId(Integer.valueOf(ticketId));
+        tpTicket.setStatus("5");
+        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+
+        //工单处理表新增评分记录
+        TpTicketRecord record = new TpTicketRecord();
+        record.setCommunityId(communityId);
+        record.setTicketId(Integer.valueOf(ticketId));
+        record.setStatus("5");
+        //todo
+        record.setCreateUser(1);
+        record.setCreateDate(new Date());
+        tpTicketRecordMapper.insertSelective(record);
     }
 
     public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId){
         ResponseBean responseBean = new ResponseBean();
+        //判断是否已经报名
+        //todo
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, 1);
+        if (signNum != 0){
+            responseBean.addError("9996", "您已报名，请勿重复报名");
+            return responseBean;
+        }
+
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(tpActivity.getId());
         tpActivitySignup.setCommunityId(communityId);

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

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -184,6 +185,11 @@ public class TaUserServiceImpl implements ITaUserService {
 
     }
 
+    @Override
+    public List<TaUser> getAllRoomUserList(Integer parentId) {
+        return taUserMapper.selectUserListByParentId(parentId);
+    }
+
     @Transactional
     @Override
     public ResponseBean modifyUser(TaUser user) {

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

@@ -267,4 +267,10 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
 
+  <select id="selectUserListByParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where parent_id = #{parentId}
+  </select>
 </mapper>

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

@@ -32,7 +32,8 @@
 
   <select id="selectAllByNum" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List"></include>
+    id, community_id, banner_description, sort, banner_cover, banner_position, eff_time,
+    exp_time, banner_type, external_link, banner_title, create_user, create_date
     from to_banner t where t.eff_time &lt; #{nowTime}
     and t.exp_time &gt; #{nowTime}
     order by t.sort, t.eff_time

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

@@ -111,4 +111,10 @@
     where activity_id = #{id,jdbcType=INTEGER} and community_id = #{communityId}
   </select>
 
+  <select id="findTpActivetitySignByUserId" resultType="java.lang.Integer">
+    select
+    count(*)
+    from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{userId}
+  </select>
 </mapper>