bug

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -116,7 +116,14 @@ public class TpTicketController extends BaseController {
     })
     @RequestMapping(value = "/wx/addRecord", method = RequestMethod.POST)
     public ResponseBean wxAddRecord(@RequestBody String parameter, HttpServletRequest request){
-        TaPerson person = taPersonService.getById(getPersonId(request));
+        TaUser taUser = getPropUserByPersonId(getPersonId(request));
+
+        ResponseBean  responseBean = tpTicketService.addRecord(parameter,taUser.getUserId(),getOrgId(request));
+        return responseBean;
+    }
+
+    private TaUser getPropUserByPersonId(String personId) {
+        TaPerson person = taPersonService.getById(personId);
         LambdaQueryWrapper<TaUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaUser::getPhone,person.getPhone());
         List<TaUser> list = userService.list(queryWrapper);
@@ -124,9 +131,7 @@ public class TpTicketController extends BaseController {
         if (list.size() > 0){
             taUser = list.get(0);
         }
-
-        ResponseBean  responseBean = tpTicketService.addRecord(parameter,taUser.getUserId(),getOrgId(request));
-        return responseBean;
+        return taUser;
     }
 
     // @ApiOperation(value = "修改工单状态为拒绝处理", notes = "修改工单状态为拒绝处理")
@@ -166,6 +171,23 @@ public class TpTicketController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 已完成订单
+     * @param parameter
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "维修人员结束工单", notes = "维修人员结束工单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单编号")
+    })
+    @RequestMapping(value = "/wx/endTicket", method = RequestMethod.POST)
+    public ResponseBean wxEndTicket(@RequestBody String parameter, HttpServletRequest request){
+        TaUser taUser = getPropUserByPersonId(getPersonId(request));
+        ResponseBean  responseBean = tpTicketService.endTicket(parameter,taUser.getUserId(),taUser.getOrgId(),taUser.getUserName(),taUser.getLoginName());
+        return responseBean;
+    }
+
 
     @RequestMapping(value = "/admin/updateTicketPrice", method = RequestMethod.POST)
     public ResponseBean updateTicketPrice(@RequestBody String parameter, HttpServletRequest request){

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

@@ -1089,7 +1089,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         Integer  ticketId = object.getInteger("ticketId");
         TpTicket tpTicket= new TpTicket();
         tpTicket.setId(ticketId);
-        tpTicket.setStatus("5");
+        tpTicket.setStatus("4");
         tpTicket.setUpdateDate(LocalDateTime.now());
         tpTicketMapper.updateById(tpTicket);
         /**维护工单处理表**/