增加人员上限的显示

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -64,6 +64,7 @@ public class User extends Model<User> {
      * 创建时间
      */
     @TableField("create_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createTime;
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java

@@ -535,7 +535,7 @@ public class DingDingServiceImpl implements DingDingService {
         try {
             String accessToken = null;
             if (isPrivateDeploy) {
-                getPrivateAT(corpid);
+                accessToken = getPrivateAT(corpid);
             } else {
                 accessToken = getValidCorpAccessToken(corpid);
             }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserMapper.xml

@@ -55,7 +55,7 @@
         SELECT a.id, a.role_id as roleId, a.role_name as roleName, a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
         a.department_id AS departmentId, b.department_name AS departmentName, a.department_cascade AS departmentCascade,
         a.month_cost as monthCost, a.salary_type as salaryType, a.is_active as isActive,date_format(a.`inactive_date`, '%Y-%m-%d') AS inactiveDate, a.cost_apply_date as costApplyDate,a.plate1,a.plate2,a.plate3,a.plate4,a.plate5,
-        a.job_number as jobNumber
+        a.job_number as jobNumber, DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m')  as createTime
         FROM user AS a
         LEFT JOIN department AS b ON a.department_id = b.department_id
         WHERE a.company_id = #{companyId}
@@ -78,7 +78,7 @@
         SELECT a.id,  a.role_id as roleId, a.role_name as roleName,  a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
         a.department_id AS departmentId, b.department_name AS departmentName, a.department_cascade AS departmentCascade,
         a.month_cost as monthCost, a.salary_type as salaryType, a.is_active as isActive,date_format(a.`inactive_date`, '%Y-%m-%d') AS inactiveDate, a.cost_apply_date as costApplyDate,a.plate1,a.plate2,a.plate3,a.plate4,a.plate5,
-        a.job_number as jobNumber
+        a.job_number as jobNumber, DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m')  as createTime
         FROM user AS a
         LEFT JOIN department AS b ON a.department_id = b.department_id
         WHERE a.company_id = #{companyId} AND a.department_id IN

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -63,7 +63,9 @@
                         </div>
                     </el-form-item>
                     <el-form-item>
-                        <div style="color:#999;font-size:13px;">共{{total}}人</div>
+                        <div style="color:#999;font-size:13px;">共<span :style="total>user.company.staffCountMax?'color:red;':''">{{total}}</span>人
+                        <span v-if="depData == null || depData.id == -1">(上限:{{user.company.staffCountMax}}人)</span>
+                        </div>
                     </el-form-item>
                     <el-form-item style="float:right;" v-if="permissions.structureCustomConfig">
                         <el-link type="primary" :underline="false" @click="customConfigShow">自定义配置</el-link>
@@ -147,7 +149,7 @@
                 <el-table-column prop="name" label="姓名" ></el-table-column>
                 <el-table-column prop="jobNumber" label="工号" ></el-table-column>
                 <el-table-column prop="phone" label="手机" width="120"></el-table-column>
-                <el-table-column prop="departmentName" label="部门" ></el-table-column>
+                <el-table-column prop="departmentName" label="部门" width="220"></el-table-column>
                 <el-table-column label="角色" width="100">
                     <template slot-scope="scope">{{scope.row.roleName}}</template>
                 </el-table-column>
@@ -159,11 +161,13 @@
                         <el-link v-if="user.timeType.isSecretSalary==0" @click.native="showSalaryList(scope.row)"><i class="iconfont firerock-iconrecord"></i></el-link>
                     </template>
                 </el-table-column>
-                <el-table-column label="状态" width="160">
+                <el-table-column label="状态" width="100">
                     <template slot-scope="scope">
                         <span>{{scope.row.isActive==0 ? '停用(' + scope.row.inactiveDate + ')' : '在职'}}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="创建时间" width="150" prop="createTime">
+                </el-table-column>
                 <el-table-column label="操作" width="300" fixed="right">
                     <template slot-scope="scope">
                         <el-button size="mini" type="default" v-if="scope.row.roleName == '超级管理员' && user.id == scope.row.id" @click="transferRole(scope.row)">转让</el-button>