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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,6 +20,9 @@ import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.*;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -563,4 +567,37 @@ public class TaUserController extends BaseController {
         responseBean = iTaUserService.departureUser(userId, customerIdList, consultantUserId);
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+     @ApiOperation(value = "获取生活顾问列表", notes = "获取生活顾问列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少条"),
+    })
+    @RequestMapping(value="/wx/life-consultant/list",method= RequestMethod.GET)
+    public ResponseBean lifeConsultantList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaUser> pg = new Page<TaUser>(pageNum, pageSize);
+            LambdaQueryWrapper<TaUser> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TaUser::getOrgId,getOrgId(request));
+            queryWrapper.eq(TaUser::getType,"life-consultant");
+            queryWrapper.orderByDesc(TaUser::getCreateDate);
+            IPage<TaUser> result = iTaUserService.page(pg,queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TpLifeConsultantEvaluateController.java

@@ -0,0 +1,172 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
+import com.huiju.estateagents.center.taUser.service.ITpLifeConsultantEvaluateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+    * 生活顾问评价表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-12-17
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "生活顾问评分 API", description = "生活顾问评分 API")
+public class TpLifeConsultantEvaluateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpLifeConsultantEvaluateController.class);
+
+    @Autowired
+    public ITpLifeConsultantEvaluateService iTpLifeConsultantEvaluateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tpLifeConsultantEvaluate",method= RequestMethod.GET)
+    public ResponseBean tpLifeConsultantEvaluateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TpLifeConsultantEvaluate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TpLifeConsultantEvaluate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TpLifeConsultantEvaluate> result = iTpLifeConsultantEvaluateService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tpLifeConsultantEvaluateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tpLifeConsultantEvaluate 实体对象
+     * @return
+     */
+    @ApiOperation(value = "生活顾问打分", notes = "生活顾问打分")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "TpLifeConsultantEvaluate",name = "tpLifeConsultantEvaluate",value = "")
+    })
+    @RequestMapping(value="/wx/tpLifeConsultantEvaluate",method= RequestMethod.POST)
+    public ResponseBean tpLifeConsultantEvaluateAdd(@RequestBody TpLifeConsultantEvaluate tpLifeConsultantEvaluate, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            tpLifeConsultantEvaluate.setOrgId(getOrgId(request));
+            tpLifeConsultantEvaluate.setPersonId(getPersonId(request));
+            tpLifeConsultantEvaluate.setCreateDate(LocalDateTime.now());
+            tpLifeConsultantEvaluate.setEvaluateTime(new SimpleDateFormat("yyyyMMdd").format(new Date()));
+            LambdaQueryWrapper<TpLifeConsultantEvaluate> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,tpLifeConsultantEvaluate.getOrgId());
+            queryWrapper.eq(TpLifeConsultantEvaluate::getPersonId,tpLifeConsultantEvaluate.getPersonId());
+            queryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,tpLifeConsultantEvaluate.getEvaluateTime());
+            List<TpLifeConsultantEvaluate> list = iTpLifeConsultantEvaluateService.list(queryWrapper);
+            if (list.size() > 0){
+                responseBean.addError("你当月已经投票了");
+                return responseBean;
+            }
+            if (iTpLifeConsultantEvaluateService.save(tpLifeConsultantEvaluate)){
+                responseBean.addSuccess(tpLifeConsultantEvaluate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tpLifeConsultantEvaluateAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tpLifeConsultantEvaluate/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tpLifeConsultantEvaluateDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTpLifeConsultantEvaluateService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tpLifeConsultantEvaluateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tpLifeConsultantEvaluate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tpLifeConsultantEvaluate/{id}",method= RequestMethod.PUT)
+    public ResponseBean tpLifeConsultantEvaluateUpdate(@PathVariable Integer id,
+                                        @RequestBody TpLifeConsultantEvaluate tpLifeConsultantEvaluate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTpLifeConsultantEvaluateService.updateById(tpLifeConsultantEvaluate)){
+                responseBean.addSuccess(tpLifeConsultantEvaluate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tpLifeConsultantEvaluateUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tpLifeConsultantEvaluate/{id}",method= RequestMethod.GET)
+    public ResponseBean tpLifeConsultantEvaluateGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTpLifeConsultantEvaluateService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tpLifeConsultantEvaluateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TpLifeConsultantEvaluate.java

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 生活顾问评价表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpLifeConsultantEvaluate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 评分
+     */
+    private Integer score;
+
+    /**
+     * 当前年月yyyymm
+     */
+    private String evaluateTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Boolean status;
+
+    /**
+     * 投票人员
+     */
+    private String personId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TpLifeConsultantEvaluateMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 生活顾问评价表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-12-17
+ */
+@Mapper
+public interface TpLifeConsultantEvaluateMapper extends BaseMapper<TpLifeConsultantEvaluate> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITpLifeConsultantEvaluateService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
+
+/**
+ * <p>
+ * 生活顾问评价表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-12-17
+ */
+public interface ITpLifeConsultantEvaluateService extends IService<TpLifeConsultantEvaluate> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TpLifeConsultantEvaluateServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
+import com.huiju.estateagents.center.taUser.mapper.TpLifeConsultantEvaluateMapper;
+import com.huiju.estateagents.center.taUser.service.ITpLifeConsultantEvaluateService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 生活顾问评价表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-12-17
+ */
+@Service
+public class TpLifeConsultantEvaluateServiceImpl extends ServiceImpl<TpLifeConsultantEvaluateMapper, TpLifeConsultantEvaluate> implements ITpLifeConsultantEvaluateService {
+
+}

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){
@@ -311,4 +333,24 @@ public class TpTicketController extends BaseController {
         ResponseBean  responseBean = tpTicketService.addWxRecordComment(parameter,taPerson.getPersonId(),1,taPerson.getName());
         return responseBean;
     }
+
+    /**
+     * 获取维修人员的订单列表
+     * @param
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "获取维修人员的订单列表", notes = "获取维修人员的订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据")
+    })
+    @RequestMapping(value = "/wx/worker/list", method = RequestMethod.GET)
+    public ResponseBean getWorkerList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                      HttpServletRequest request){
+        TaUser taUser = getPropUserByPersonId(getPersonId(request));
+        ResponseBean  responseBean = tpTicketService.getWorkerList(pageNum,pageSize,taUser.getUserId(),taUser.getOrgId());
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/property/service/TpTicketService.java

@@ -159,4 +159,14 @@ public interface TpTicketService extends IService<TpTicket> {
      * @return
      */
     ResponseBean endTicket(String parameter, Integer userId, Integer orgId, String userName, String loginName);
+
+    /**
+     * 获取维修人员的工单列表
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -1089,7 +1090,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);
         /**维护工单处理表**/
@@ -1104,4 +1105,24 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         response.addSuccess("成功");
         return response;
     }
+
+    /**
+     * 获取维修人员的工单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId) {
+        IPage<TpTicket> page = new Page<>(pageNum,pageSize);
+        LambdaQueryWrapper<TpTicket> tpTicketLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        tpTicketLambdaQueryWrapper.eq(TpTicket::getOrgId,orgId);
+        tpTicketLambdaQueryWrapper.eq(TpTicket::getTpUserId,userId);
+        tpTicketLambdaQueryWrapper.orderByDesc(TpTicket::getCreateDate);
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectPage(page, tpTicketLambdaQueryWrapper);
+        return ResponseBean.success(tpTicketIPage);
+    }
 }

src/main/resources/mapper/TpLifeConsultantEvaluateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TpLifeConsultantEvaluateMapper">
+
+</mapper>