合并4486 4483 4481

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

@@ -327,7 +327,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "app问题反馈", notes = "app问题反馈")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:问题描述,feedbackImg:反馈的图片,taUserTel:反馈人电话"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:问题描述,imageUrl:反馈的图片,taUserTel:反馈人电话"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/addfeedback",method = RequestMethod.POST)
@@ -339,6 +339,15 @@ public class UserController extends BaseController {
 
     }
 
+    @ApiOperation(value = "联系电话", notes = "联系电话")
+    @RequestMapping(value = "/user/operatetel",method = RequestMethod.GET)
+    public ResponseBean operatetel(){
+        ResponseBean response = new ResponseBean();
+        response = iTaUserService.operatetel();
+        return response;
+
+    }
+
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/ToOperateTelMapper.java

@@ -0,0 +1,38 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.ToOperateTel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ToOperateTelMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ToOperateTel record);
+
+    int insertSelective(ToOperateTel record);
+
+    ToOperateTel selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ToOperateTel record);
+
+    int updateByPrimaryKey(ToOperateTel record);
+
+    /**
+     * 查询当前电话
+     * @param name
+     * @param tel
+     * @param remark
+     * @return
+     */
+    List<ToOperateTel> getPhoneList(@Param("name") String name, @Param("tel") String tel, @Param("remark") String remark);
+
+
+    /**
+     * 查询所有电话
+     */
+    List<ToOperateTel> selectOperatetel();
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/ToOperateTel.java

@@ -0,0 +1,99 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class ToOperateTel {
+    private Integer id;
+
+    private String name;
+
+    private String tel;
+
+    private String remark;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    /**
+     * 创建人名称
+     * @return
+     */
+    private String userUame;
+
+    public String getUserUame() {
+        return userUame;
+    }
+
+    public void setUserUame(String userUame) {
+        this.userUame = userUame;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel == null ? null : tel.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -211,4 +211,10 @@ public interface ITaUserService {
      * @return
      */
     ResponseBean addFeedback(UserElement userElement, String parameter);
+
+    /**
+     * 联系电话
+     * @return
+     */
+    ResponseBean operatetel();
 }

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

@@ -167,6 +167,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private  TaFeedbackImgMapper taFeedbackImgMapper;
 
+    @Autowired
+    private ToOperateTelMapper toOperateTelMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code, HttpSession session) {
@@ -1226,12 +1229,14 @@ public class TaUserServiceImpl implements ITaUserService {
 
        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
        /*期-栋-单元-楼层-户号*/
-       taFeedback.setEstateSource(null==taUserVerify?null:taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
+
+       ToCommunities toCommunities= toCommunitiesMapper.selectByPrimaryKey(taUserVerify.getCommunityId());
+       taFeedback.setEstateSource(null==taUserVerify?null:toCommunities.getCommunityName()+taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
        taFeedback.setHandleStatus("2");
        taFeedback.setCreateDate(new Date());
        taFeedback.setCreateUser(userElement.getUserVerifyId());
        taFeedbackMapper.insert(taFeedback);
-        JSONArray jSONArray= JSONObject.parseObject(parameter).getJSONArray("feedbackImg");
+        JSONArray jSONArray= JSONObject.parseObject(parameter).getJSONArray("imageUrl");
        if(null!=jSONArray) {
            String[] feedbackImgArr = jSONArray.toArray(new String[]{});
            for (String imgUrl : feedbackImgArr) {
@@ -1245,4 +1250,12 @@ public class TaUserServiceImpl implements ITaUserService {
         response.addSuccess("成功");
         return response;
     }
+
+    @Override
+    public ResponseBean operatetel() {
+        ResponseBean response = new ResponseBean();
+         List<ToOperateTel> operateTel= toOperateTelMapper.selectOperatetel();
+         response.addSuccess(operateTel);
+         return response;
+    }
 }

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

@@ -190,6 +190,6 @@
         and handle_status like CONCAT('%', #{handleStatus,jdbcType=VARCHAR}, '%')
       </if>
     </where>
-    ORDER BY update_date desc
+    ORDER BY create_date desc
   </select>
 </mapper>

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

@@ -0,0 +1,151 @@
+<?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.ToOperateTelMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.ToOperateTel" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="tel" property="tel" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="user_name" property="userUame" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, name, tel, remark, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from to_operate_tel
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from to_operate_tel
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.ToOperateTel" >
+    insert into to_operate_tel (id, name, tel, 
+      remark, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{tel,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.ToOperateTel" >
+    insert into to_operate_tel
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="tel != null" >
+        tel,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="tel != null" >
+        #{tel,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.ToOperateTel" >
+    update to_operate_tel
+    <set >
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="tel != null" >
+        tel = #{tel,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.ToOperateTel" >
+    update to_operate_tel
+    set name = #{name,jdbcType=VARCHAR},
+      tel = #{tel,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="getPhoneList" resultMap="BaseResultMap">
+    select *,p.user_name as userUame from to_operate_tel
+    left join to_user p on to_operate_tel.update_user = p.id
+    <where>
+      <if test="tel != null and tel !=''">
+        and tel like CONCAT('%', #{tel,jdbcType=VARCHAR}, '%')
+      </if>
+
+      <if test="remark != null and remark !=''">
+        and to_operate_tel.remark like CONCAT('%', #{remark,jdbcType=VARCHAR}, '%')
+      </if>
+
+      <if test="name != null and name !=''">
+        and name like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
+      </if>
+    </where>
+    ORDER BY to_operate_tel.update_date desc
+  </select>
+
+  <select id="selectOperatetel" resultMap="BaseResultMap">
+    select * from to_operate_tel
+  </select>
+</mapper>

VUECODE/smart-operate-manage/src/views/banner/feedback/index.vue

@@ -77,8 +77,8 @@
       label="处理状态">
       <template slot-scope="scope">
           <span v-if="scope.row.handleStatus ==1">已处理</span>
-          <span v-if="scope.row.handleStatus ==2">未处理</span>
-          <span v-if="scope.row.handleStatus ==3">正在处理</span>
+          <span v-if="scope.row.handleStatus ==2" style="color:#FF0000">未处理</span>
+          <span v-if="scope.row.handleStatus ==3" style="color:#FF6A6A">正在处理</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -233,7 +233,7 @@
     },
 
     empty(){
-        this.listQuery.handleRemark = ''
+        this.listQuery.content = ''
         this.listQuery.handleStatus = ''
         this.listQuery.tel = ''
         this.listQuery.pageNum = 1