新建工单关联表

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

@@ -248,4 +248,5 @@
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
   </select>
+  <select id="ticketList" resultType="com.community.huiju.model.TpTicket"></select>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java

@@ -0,0 +1,54 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IUserService;
+import com.community.huiju.service.TpTicketService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import com.community.huiju.common.base.BaseController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 工单表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "工单列表API", description = "工单列表API")
+public class TpTicketController extends BaseController {
+    @Autowired
+    private IUserService userService;
+
+    @Autowired
+    private TpTicketService tpTicketService;
+    @ApiOperation(value = "工单列表", notes = "工单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号，" +
+                    "type:工单类型(1:投诉 2:报修   3:联系物业)," +
+                    "ticketTitle:工单标题，createUser:发起人," +
+                    "status:流转状态(0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止'）" +
+                    "tpUserId:当前处理人" )
+    })
+    @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
+    public ResponseBean addUser(@RequestBody String parameter, HttpSession session){
+//        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = tpTicketService.ticketLiset(parameter);
+        return responseBean;
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 工单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Mapper
+public interface TpTicketMapper extends BaseMapper<TpTicket> {
+
+    IPage<TpTicket> ticketList(Page page, @Param("ticket")TpTicket ticket);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketRecordCommentMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTicketRecordComment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 物业端工单追问表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+public interface TpTicketRecordCommentMapper extends BaseMapper<TpTicketRecordComment> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpTicketRecord;
+
+/**
+ * <p>
+ * 工单处理表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+public interface TpTicketRecordMapper extends BaseMapper<TpTicketRecord> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java

@@ -0,0 +1,104 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 工单表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_ticket")
+public class TpTicket implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工单id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 住户app的id
+     */
+    private Integer taUserId;
+
+    /**
+     * 工单标题
+     */
+    private String ticketTitle;
+
+    /**
+     * 工单内容
+     */
+    private String ticketContent;
+
+    /**
+     * 流转状态      0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止
+     */
+    private String status;
+
+    /**
+     * 类型    type:    1:投诉 2:报修   3:联系物业  字典
+     */
+    private String type;
+
+    /**
+     * 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型 加表
+     */
+    private String repairType;
+
+    /**
+     * 受理人id 也就是物业的用户id   加 中间关系表
+     */
+    private Integer tpUserId;
+
+    /**
+     * 评分
+     */
+    private String score;
+
+    /**
+     * 评语
+     */
+    private String comment;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecord.java

@@ -0,0 +1,57 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 工单处理表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_ticket_record")
+public class TpTicketRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 工单id
+     */
+    private Integer ticketId;
+
+    /**
+     * 自动生成的提示信息
+     */
+    private String content;
+
+    /**
+     * 流转状态      0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止
+     */
+    private String status;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物业端工单追问表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_ticket_record_comment")
+public class TpTicketRecordComment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 工单id
+     */
+    private Integer ticketId;
+
+    /**
+     * 工单记录id
+     */
+    private Integer ticketRecordId;
+
+    /**
+     * 追问人id(tp_user_id也就是物业用户)   或者是 发起人id(ta_user_id也就是住户app的id)
+     */
+    private Integer uuid;
+
+    /**
+     * 用户类型： 0：追问人  1：发起人
+     */
+    private String userType;
+
+    /**
+     * 追问内容或者回复内容
+     */
+    private String content;
+
+    /**
+     * 回复的是哪条记录的id。 0表示当前状态下的第一条追问记录
+     */
+    private Integer parentId;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java

@@ -0,0 +1,23 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpTicket;
+
+/**
+ * <p>
+ * 工单表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+public interface TpTicketService extends IService<TpTicket> {
+
+    /**
+     * 工单列表
+     * @param parameter
+     * @return
+     */
+    ResponseBean ticketLiset(String parameter);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -0,0 +1,76 @@
+package com.community.huiju.service.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.TpTicketMapper;
+import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.User;
+import com.community.huiju.service.TpTicketService;
+import com.community.huiju.vo.TpTicketVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 工单表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-02-14
+ */
+@Service
+public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> implements TpTicketService {
+
+    @Autowired
+    private  TpTicketMapper tpTicketMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+    @Override
+    public ResponseBean ticketLiset(String parameter) {
+         ResponseBean response= new ResponseBean<>();
+        TpTicket   ticket= JSONObject.parseObject(parameter, TpTicket.class);
+
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<TpTicket> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<TpTicket> pageInfo = tpTicketMapper.ticketList(page,ticket);
+        List<TpTicket> ticketList = pageInfo.getRecords();
+
+        List<TpTicket> tpTicketArrayList= new ArrayList<>();
+
+        for (TpTicket tpTicket:ticketList){
+            TpTicketVO tpTicketVO= new TpTicketVO();
+            BeanUtils.copyProperties(tpTicket, tpTicketVO);
+            /*查询当前受理人*/
+            String userName=userMapper.selectByIdUserName(tpTicket.getTpUserId());
+            tpTicketVO.setTpUserNmae(userName);
+
+            /*查询当前工单创建人*/
+            String createUserNmae=userMapper.selectByIdUserName(tpTicket.getCreateUser());
+            tpTicketVO.setCreateUserNmae(createUserNmae);
+            tpTicketArrayList.add(tpTicketVO);
+        }
+        HashMap map=new HashMap<>();
+        map.put("list",tpTicketArrayList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -0,0 +1,26 @@
+package com.community.huiju.vo;
+
+import com.community.huiju.model.TpTicket;
+import lombok.Data;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/2/14
+ **/
+@Data
+public class TpTicketVO extends TpTicket {
+    /**
+     * 发起人
+     */
+    private String createUserNmae;
+
+    /**
+     * 受理人
+     */
+    private String tpUserNmae;
+
+}

CODE/smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml

@@ -0,0 +1,47 @@
+<?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.community.huiju.dao.TpTicketMapper">
+    <select id="ticketList" resultType="com.community.huiju.model.TpTicket">
+    SELECT
+	id,
+	community_id,
+	ta_user_id,
+	ticket_title,
+	ticket_content,
+	STATUS,
+	type,
+	repair_type,
+	tp_user_id,
+	score,
+	COMMENT,
+	create_user,
+	create_date,
+	update_user,
+	update_date
+FROM
+tp_ticket
+<where>
+    <if test="ticket.id != null and ticket.id !=''">
+        and  id=#{ticket.id,jdbcType=INTEGER}
+    </if>
+    <if test="ticket.type != null and ticket.type !=''">
+        and type like concat('%',#{ticket.type,jdbcType=VARCHAR},'%')
+    </if>
+    <if test="ticket.ticketTitle != null and ticket.ticketTitle !=''">
+        and ticket_title like concat('%',#{ticket.ticketTitle,jdbcType=VARCHAR},'%')
+    </if>
+    <if test="ticket.createUser != null and ticket.createUser !=''">
+        and create_user like concat('%',#{ticket.createUser,jdbcType=VARCHAR},'%')
+    </if>
+    <if test="ticket.status != null and ticket.status !=''">
+        and  status=#{ticket.status,jdbcType=INTEGER}
+    </if>
+    <if test="ticket.tpUserId != null and ticket.tpUserId !=''">
+        and  tp_user_id=#{ticket.tpUserId,jdbcType=INTEGER}
+    </if>
+</where>
+        order by  create_date desc
+
+    </select>
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpTicketRecordCommentMapper.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.community.huiju.dao.TpTicketRecordCommentMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpTicketRecordMapper.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.community.huiju.tp.mapper.TpTicketRecordMapper">
+
+</mapper>