提交分支

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

@@ -192,12 +192,13 @@ public class SocialController {
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "二手租赁帖子Id")
     })
     @RequestMapping(value = "/ubDateAllTransaction",method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction( HttpSession session, TpTransaction tpTransaction){
+    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);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.updateTransaction(tpTransaction, userId);
         return response;
+    }
 
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),

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

@@ -74,13 +74,6 @@ public interface SocialServiceI {
 	 */
 	ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId);
 
-	/**
-	 * 修改报修内容
-	 * @param ticketId
-	 * @param tpTicket
-	 */
-	void updateTicketContent(Integer ticketId, TpTicket tpTicket);
-
 	/**
 	 * 添加二手租赁帖子
 	 */
@@ -99,7 +92,7 @@ public interface SocialServiceI {
 	 * @param userId
 	 * @return
 	 */
-	ResponseBean ubdateTransaction(TpTransaction tpTransaction,Integer userId);
+	ResponseBean updateTransaction(TpTransaction tpTransaction,Integer userId);
 	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type);
 
 	/**

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

@@ -280,7 +280,7 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean ubdateTransaction(TpTransaction tpTransaction,Integer userId) {
+    public ResponseBean updateTransaction(TpTransaction tpTransaction,Integer userId) {
         ResponseBean response = new ResponseBean();
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
         tpTransaction.setCommunityId(user.getCommunityId());
@@ -293,6 +293,9 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionMapper.updateByPrimaryKey(tpTransaction);
         response.addSuccess("修改成功");
         return response;
+    }
+
+    @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId) {
         //修改工单内容和评分
         tpTicket.setId(Integer.valueOf(ticketId));
@@ -329,6 +332,7 @@ public class SocialServiceImpl implements SocialServiceI {
         responseBean.addSuccess("报名成功");
         return responseBean;
     }
+
     @Transactional
     @Override
     public TpTransaction findUsedDetails(Integer activityId, Integer communityId, Integer userId) {

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

@@ -45,9 +45,6 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TaUserMapper taUserMapper;
 
-    @Autowired
-    private TaUserMapper taUserMapper;
-
     @Override
     public ResponseBean getList(TpTicket tpTicket,Integer pageNum, Integer pageSize) {
 
@@ -180,7 +177,7 @@ public class TicketServiceImpl implements ITicketService {
     @Override
     public ResponseBean addAiTicketService(Integer userId, TpTicket tpTicket) {
         ResponseBean response = new ResponseBean();
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
         tpTicket.setCommunityId(user.getCommunityId());
         tpTicket.setTaUserId(userId);
         tpTicket.setTpUserId(userId);
@@ -189,9 +186,9 @@ public class TicketServiceImpl implements ITicketService {
         tpTicket.setUpdateUser(userId);
         tpTicket.setUpdateDate(new Date());
         tpTicketMapper.insert(tpTicket);
-        TpTicketRecord  tpTicketRecord=new TpTicketRecord();
+        TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
-        TpTicket tpTicketReco=tpTicketMapper.getById(userId,user.getCommunityId());
+        TpTicket tpTicketReco = tpTicketMapper.getById(userId, user.getCommunityId());
         tpTicketRecord.setCommunityId(user.getCommunityId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
         tpTicketRecord.setCreateUser(userId);
@@ -199,7 +196,7 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecordMapper.insert(tpTicketRecord);
         response.addSuccess("新增成功");
         return response;
-    
+    }
     /**
      * 回复工单
      * @param tpTicketRecordComment