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

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

@@ -306,7 +306,10 @@ public class BuildingOwnerInfoController extends BaseController {
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
         XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(userElement).getData();
-        this.setResponseHeader(response, "业主资料库.xlsx");
+//        this.setResponseHeader(response, "业主资料库.xlsx");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=业主资料库.xlsx");
         //响应到客户端
         try {
             OutputStream os = response.getOutputStream();

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

@@ -117,6 +117,19 @@ public class TpTicketController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 已完成订单
+     * @param parameter
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/endTicket", method = RequestMethod.POST)
+    public ResponseBean endTicket(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.endTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.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/TpTicketService.java

@@ -148,4 +148,15 @@ public interface TpTicketService extends IService<TpTicket> {
      * @return
      */
     ResponseBean updateTicketPrice(String parameter, Integer userId, Integer orgId);
+
+    /**
+     * 完成工单
+     * @param parameter
+     * @param userId
+     * @param orgId
+     * @param userName
+     * @param loginName
+     * @return
+     */
+    ResponseBean endTicket(String parameter, Integer userId, Integer orgId, String userName, String loginName);
 }

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

@@ -1066,4 +1066,38 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicket.setPriceExplain(ticket.getPriceExplain());
         return ResponseBean.success(tpTicket);
     }
+
+    /**
+     * 完成工单
+     *
+     * @param parameter
+     * @param userId
+     * @param orgId
+     * @param userName
+     * @param loginName
+     * @return
+     */
+    @Override
+    public ResponseBean endTicket(String parameter, Integer userId, Integer orgId, String userName, String loginName) {
+        ResponseBean response=new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        String  content = object.getString("content");
+        Integer  ticketId = object.getInteger("ticketId");
+        TpTicket tpTicket= new TpTicket();
+        tpTicket.setId(ticketId);
+        tpTicket.setStatus("5");
+        tpTicket.setUpdateDate(LocalDateTime.now());
+        tpTicketMapper.updateById(tpTicket);
+        /**维护工单处理表**/
+        TpTicketRecord tpTicketRecord = new TpTicketRecord();
+        tpTicketRecord.setOrgId(orgId);
+        tpTicketRecord.setTicketId(ticketId);
+        tpTicketRecord.setContent("物业工作人员"+userName+"置为已完成！");
+        tpTicketRecord.setStatus("4");
+        tpTicketRecord.setCreateUser(userId.toString());
+        tpTicketRecord.setCreateDate(LocalDateTime.now());
+        tpTicketRecordMapper.insert(tpTicketRecord);
+        response.addSuccess("成功");
+        return response;
+    }
 }