合并

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

@@ -1,11 +1,15 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.SysRole;
+import com.community.huiju.model.TpTransaction;
 import com.community.huiju.model.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 物业web端用户表 Mapper 接口
@@ -16,4 +20,5 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface RoleMapper extends BaseMapper<SysRole> {
+	List<SysRole> getRoleListByParams(Page page,@Param("role") SysRole role);
 }

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

@@ -58,6 +58,14 @@ public class SysRole implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateDate;
-
-
+    
+    /**
+     * 创建人
+     */
+    private String createName;
+    
+    /**
+     * 更新人
+     */
+    private String updateName;
 }

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

@@ -44,11 +44,11 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		SysRole role = new SysRole();
 		role.setRoleName(roleName);
 		role.setCommunityId(userElement.getCommunityId());
-		List<TpTransaction> list = roleMapper.getRoleListByParams(page,role);
+		List<SysRole> list = roleMapper.getRoleListByParams(page,role);
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("list",list);
 		map.put("total",page.getTotal());
 		responseBean.addSuccess(map);
-		return null;
+		return responseBean;
 	}
 }

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

@@ -1,5 +1,29 @@
 <?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.SysRoleMapper">
-
+<mapper namespace="com.community.huiju.dao.RoleMapper">
+    <select id="getRoleListByParams" resultType="com.community.huiju.model.SysRole">
+        SELECT
+            t.id,
+            t.community_id as communityId,
+            t.role_name AS roleName,
+            t.description,
+            t.create_user AS createUser,
+            t.create_date AS createDate,
+            t.update_user AS updateUser,
+            t.update_date AS updateDate,
+            u.user_name as createName,
+            uu.user_name as updateName
+        FROM
+            tp_sys_role t
+        LEFT JOIN tp_user u ON t.create_user = u.id AND u.community_id = #{role.communityId}
+        LEFT JOIN tp_user uu ON t.create_user = uu.id AND uu.community_id = #{role.communityId}
+        where
+          1 = 1
+        AND t.community_id = #{role.communityId}
+        <if test="role.roleName != null and role.roleName != ''">
+            and t.roleName like concat('%',#{role.roleName,jdbcType=VARCHAR},'%')
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

VUECODE/smart-property-manage/src/router/index.js

@@ -192,6 +192,13 @@ export const constantRouterMap = [
         component: () => import('@/views/account/role'),
         name: 'role-index',
         meta: { title: '角色管理', icon: 'table' }
+      },
+      {
+        path: '/account/add',
+        component: () => import('@/views/account/add/role-add'),
+        name: 'role-add',
+        hidden: true,
+        meta: { title: '添加角色', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/role.js

@@ -9,7 +9,7 @@ const transaction = {
 
   mutations: {
     SET_LIST: (state, list) => {
-      state.transactionList = list
+      state.roleList = list
     },
     SET_TOTAL: (state, total) => {
       state.total = total

VUECODE/smart-property-manage/src/views/account/add/role-add.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="角色名称" prop="phase">
+        <el-input v-model="ruleForm.phase"/>
+      </el-form-item>
+      <el-form-item label="角色描述" prop="building">
+        <el-input v-model="ruleForm.building"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        phase: '',
+        building: '',
+        unit: '',
+        level: '',
+        roomNo: '',
+        ownerName: '',
+        ownerTel: ''
+      },
+      rules: {
+        phase: [
+          { required: true, message: '请输入角色名称', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addBuilding()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      this.$refs[formName].resetFields()
+    },
+    addBuilding() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('AddBuilding', this.ruleForm).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'building-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>

VUECODE/smart-property-manage/src/views/account/role.vue

@@ -6,9 +6,9 @@
       <el-button v-waves class="filter-item" type="primary" @click="handleFilter">查询</el-button>
     </div>
     <div style="margin-top: 20px;">
-      <el-button type="primary" @click="addActivity">添加</el-button>
-      <el-button type="warning" @click="ediActivity">修改</el-button>
-      <el-button type="danger" @click="invalidActivity">作废</el-button>
+      <el-button type="primary" @click="addRole">添加</el-button>
+      <el-button type="warning" @click="editRole">修改</el-button>
+      <el-button type="danger" @click="deleteRole">删除</el-button>
     </div>
     
     <el-table
@@ -23,17 +23,17 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="角色名称" align="center">
         <template slot-scope="scope">
-          <span @click="handleLook(scope.row.id)" style="color: #409EFF;cursor: pointer">{{ scope.row.transactionTitle }}</span>
+          <span @click="handleLook(scope.row.id)" style="color: #409EFF;cursor: pointer">{{ scope.row.roleName }}</span>
         </template>
       </el-table-column>
       <el-table-column label="角色描述" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.viewCount }}</span>
+          <span>{{ scope.row.description }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.userName }}</span>
+          <span>{{ scope.row.createName }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center">
@@ -43,12 +43,12 @@
       </el-table-column>
       <el-table-column label="修改人" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.userName }}</span>
+          <span>{{ scope.row.updateName }}</span>
         </template>
       </el-table-column>
       <el-table-column label="修改时间" align="center">
         <template slot-scope="scope">
-          <span>{{ formatDate(scope.row.createDate) }}</span>
+          <span>{{ formatDate(scope.row.updateDate) }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -73,8 +73,8 @@ import { parseTime } from '@/utils'
 
 export default {
   computed: {
-    ...mapState('transaction', {
-      transactionList: s => s.transactionList,
+    ...mapState('role', {
+      roleList: s => s.roleList,
       total: s => s.total
     })
   },
@@ -128,10 +128,7 @@ export default {
     clearListQuery() {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 20
-      this.listQuery.transactionId = undefined
-      this.listQuery.transactionTitle = undefined
-      this.listQuery.status = undefined
-      this.listQuery.isReported = undefined
+      this.listQuery.roleName = undefined
       this.getList()
     },
     handleFilter() {
@@ -161,6 +158,9 @@ export default {
       this.listQuery.pageNum = val
       this.getList()
     },
+    addRole(){
+      this.$router.push({ name: 'role-add' })
+    },
     sortByID(order) {
       if (order === 'ascending') {
         this.listQuery.sort = '+id'