增加权限接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/DepartmentController.java

@@ -104,7 +104,6 @@ public class DepartmentController {
         return departmentService.getUserCustomDataStatistic(startDate, endDate, departmentId, request);
     }
 
-
     /**
      * 按人员导出工时统计,可选人员
      * departmentId 要查询的项目
@@ -115,5 +114,10 @@ public class DepartmentController {
     }
 
 
+    @RequestMapping("/exportDeptStatistic")
+    public HttpRespMsg exportDeptStatistic(String startDate, String endDate, HttpServletRequest request) {
+        return departmentService.exportDeptStatistic(startDate, endDate, request);
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserYearleaveSettingController.java

@@ -7,12 +7,16 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.mapper.UserYearleaveSettingMapper;
 import com.management.platform.service.UserYearleaveSettingService;
 import com.management.platform.util.HttpRespMsg;
+import com.management.platform.util.ListUtil;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -45,6 +49,23 @@ public class UserYearleaveSettingController {
         return new HttpRespMsg();
     }
 
+    @RequestMapping("/saveBatch")
+    public HttpRespMsg saveBatch(String userIds, Integer companyId, Integer yearDays) {
+        List<UserYearleaveSetting> list = new ArrayList<>();
+        List<String> ids = ListUtil.convertLongIdsArrayToList(userIds);
+        for (String userId : ids) {
+            if (!StringUtils.isEmpty(userId)) {
+                UserYearleaveSetting item = new UserYearleaveSetting();
+                item.setCompanyId(companyId);
+                item.setUserId(userId);
+                item.setYearDays(yearDays);
+                list.add(item);
+            }
+        }
+        userYearleaveSettingService.saveOrUpdateBatch(list);
+        return new HttpRespMsg();
+    }
+
     @RequestMapping("/list")
     public HttpRespMsg list() {
         HttpRespMsg msg = new HttpRespMsg();

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

@@ -12,7 +12,7 @@ public class GanttDataItem {
     public String id;
     public String userId;
     public String text;
-    public Integer duration;
+    public Integer time;
 //    @JsonFormat(pattern = "yyyy-MM-dd")
     public String start_date;
 //    @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -36,4 +36,6 @@ public interface DepartmentService extends IService<Department> {
     HttpRespMsg listMyMembs(HttpServletRequest request);
 
     HttpRespMsg getUserCustomDataStatistic(String startDate, String endDate, Integer departmentId, HttpServletRequest request);
+
+    HttpRespMsg exportDeptStatistic(String startDate, String endDate, HttpServletRequest request);
 }

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

@@ -390,6 +390,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 allUserIds = ListUtil.convertLongIdsArrayToList(userIds);
             }
             //按选择的人员来查询数据
+            //根据当前人员的角色权限来判断
+            User user = userMapper.selectById(request.getHeader("TOKEN"));
+
             List<Map<String, Object>> list = departmentMapper
                     .getCostByUser(null, startDate, endDate, companyId, allUserIds);
             Map<String, List<Map<String, Object>>> tempMap = new HashMap<>();
@@ -641,6 +644,99 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg exportDeptStatistic(String startDate, String endDate, HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        try {
+            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
+            User user = userMapper.selectById(request.getHeader("TOKEN"));
+            List<Integer> deptIds = new ArrayList<>();
+            deptIds.add(-1);
+            if (user.getManageDeptId() != 0) {
+                //有负责的部门
+                List<Department> myDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
+                List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
+                for (Department dept: myDeptList) {
+                    deptIds.add(dept.getDepartmentId());
+                    deptIds.addAll(getBranchDepartment(dept.getDepartmentId(), allDeptList));
+                }
+            }
+            System.out.println("获取到管理的部门ids length=="+deptIds);
+            List<Map<String, Object>> list = departmentMapper
+                    .getCostByUser(deptIds, startDate, endDate, companyId, null);
+            Map<String, List<Map<String, Object>>> tempMap = new HashMap<>();
+            for (Map<String, Object> map : list) {
+                if (tempMap.containsKey(map.get("user"))) {
+                    //这个名字已经装进数组中了
+                    List<Map<String, Object>> tempList = tempMap.get(map.get("user"));
+                    Map<String, Object> dataMap = new HashMap<>();
+                    dataMap.put("project", map.get("project"));
+                    Double time = (Double) map.getOrDefault("time", 0);
+                    dataMap.put("time", time);
+                    tempList.add(dataMap);
+                } else {
+                    //这个名字尚未装进数组中
+                    List<Map<String, Object>> tempList = new ArrayList<>();
+                    if (map.containsKey("project")) {
+                        Map<String, Object> dataMap = new HashMap<>();
+                        dataMap.put("project", map.get("project"));
+                        Double time = (Double) map.getOrDefault("time", 0);
+                        dataMap.put("time", time);
+                        tempList.add(dataMap);
+                    }
+                    tempMap.put((String) map.get("user"), tempList);
+                }
+            }
+            DecimalFormat df = new DecimalFormat("#.00");
+            List<List<String>> dataList = new ArrayList<List<String>>();
+            String[] titles = {"人员", "项目", "工时(h)"};
+            List<String> titleList = Arrays.asList(titles.clone());
+            dataList.add(titleList);
+            double totalCostTime = 0;
+            for (String key : tempMap.keySet()) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", key);
+                map.put("project", tempMap.get(key));
+                List<String> nameList = new ArrayList<String>();
+                nameList.add(key);//姓名
+                nameList.add("");//空着
+                List<Map<String, Object>> tempList = tempMap.get(key);
+                //统计个人的时间和成本
+                double tTime = 0;
+                for (Map<String, Object> membData : tempList) {
+                    tTime += (double)membData.get("time");
+                }
+                totalCostTime += tTime;
+                nameList.add(df.format(tTime));
+                dataList.add(nameList);
+                //装载该人员下的项目的工时数据
+                for (Map<String, Object> membData : tempList) {
+                    tTime += (double)membData.get("time");
+                    List<String> projectDataList = new ArrayList<>();
+                    projectDataList.add("");
+                    projectDataList.add(membData.get("project")+"");
+                    projectDataList.add(df.format((double)membData.get("time"))+"");
+                    dataList.add(projectDataList);
+                }
+            }
+            //合计
+            List<String> sumRow = new ArrayList<String>();
+            sumRow.add("合计");
+            sumRow.add("");
+            sumRow.add(""+df.format(totalCostTime));
+            dataList.add(sumRow);
+            //生成excel文件导出
+            String fileName = "人员工时统计_"+System.currentTimeMillis();
+            String resp = ExcelUtil.exportGeneralExcelByTitleAndList(fileName , dataList, path);
+
+            httpRespMsg.data = resp;
+        } catch (NullPointerException e) {
+            httpRespMsg.setError("验证失败");
+            return httpRespMsg;
+        }
+        return httpRespMsg;
+    }
+
 
     private void fillDeptUser(List<DepartmentVO> list, List<HashMap> userList) {
         list.forEach(l->{

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

@@ -1440,7 +1440,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
-                        parent.duration = 0;
+                        parent.time = 0;
                         itemList.add(parent);
                         lastItemId = userId;
                         lastParentItem = parent;
@@ -1452,7 +1452,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.start_date = start_date;
 
                     curItem.end_date = end_date;
-                    curItem.duration = (Integer)map.get("duration");
+                    curItem.time = (Integer)map.get("duration");
                     curItem.parent = lastItemId;
                     itemList.add(curItem);
                     lastItemId = userId;
@@ -1466,7 +1466,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
-                        parent.duration = 0;
+                        parent.time = 0;
                         itemList.add(parent);
                         lastItemId = projectId;
                         lastParentItem = parent;
@@ -1476,7 +1476,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.text = (String) map.get("name")+"/"+(String)map.get("task_name");
                     curItem.start_date = start_date;
                     curItem.end_date = end_date;
-                    curItem.duration = (Integer)map.get("duration");
+                    curItem.time = (Integer)map.get("duration");
                     curItem.parent = lastItemId;
                     itemList.add(curItem);
                     lastItemId = projectId;
@@ -1488,7 +1488,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if (curItem.end_date.compareTo(lastParentItem.end_date) > 0) {
                     lastParentItem.end_date = curItem.end_date;
                 }
-                lastParentItem.duration = lastParentItem.duration + curItem.duration;
+                lastParentItem.time = lastParentItem.time + curItem.time;
             }
         }
 

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

@@ -1960,7 +1960,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 if (collect.size() > 0) {
                     List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().in("project_id", collect));
                     List<String> collect1 = participationList.stream().map(Participation::getUserId).collect(Collectors.toList());
-                    allRangeUserList = userMapper.selectList(new QueryWrapper<User>().in("id", collect1));
+                    if (collect1.size() > 0) {
+                        allRangeUserList = userMapper.selectList(new QueryWrapper<User>().in("id", collect1));
+                    }
                 }
             }
         } else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -191,7 +191,6 @@ public class TimingTask {
                 //发送推送提醒
                 List<Map<String, Object>> userList = userMapper.getPushUserList(t.getCompanyId());
                 List<WxCorpInfo> cpList = wxCorpInfoMapper.selectList(new QueryWrapper<WxCorpInfo>().eq("company_id", t.getCompanyId()));
-                List<String> dingdingUserIdList = new ArrayList<>();
                 userList.forEach(u->{
                     if (u.get("corpwxUserid") != null) {
                         //推送到企业微信

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -212,8 +212,8 @@
 
             </el-form-item>
 
-            <el-form-item style="float:right;">
-                <el-link type="primary" :underline="false" @click="exportData">导出成本数据</el-link>
+            <el-form-item style="float:right;margin-right:20px;">
+                <el-link type="primary" :underline="false" @click="exportData">导出分摊数据</el-link>
             </el-form-item>
             
             <!-- <el-form-item style="float:right;margin-right:30px;" v-if="hasNoProjectUsers">

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -1684,7 +1684,7 @@
             deleteGroup(item) {
                 var _this = this;
                 this.$confirm("分组下的任务也将一同删除，您确认删除该分组吗?", "提示", {
-                    //type: 'warning'
+                    type: 'warning'
                 }).then(() => {
                     this.http.post('/task-group/delete',item,
                         res => {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -87,6 +87,8 @@
                             <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,1)">批量填报</el-link>
                             <el-link type="primary" v-if="user.role==1||user.role==2||user.role==6||user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="imports()">工时导入</el-link>
                             <el-link type="primary" style="margin-right:10px;" :underline="false" @click="showExportDialog">导出日报</el-link>
+                            <!--部门负责人给个导出工时的功能 -->
+                            <el-link type="primary" v-if="user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="showExportTimeDialog">导出工时统计</el-link>
                         </span>
                     </div>
                     <!--普通员工，含项目经理 -->
@@ -699,6 +701,26 @@
                 <el-button type="primary" @click="exportReport" style="width:100%;" >导出</el-button>
             </div>
         </el-dialog>
+        <!--导出报表条件选择 -->
+        <el-dialog title="工时统计导出" v-if="exportTimeDialog" :visible.sync="exportTimeDialog" customClass="customWidth" width="500px">
+            <el-form ref="form3" :model="exportParam" >
+                <el-form-item prop="range" label="日期范围">
+                    <el-date-picker
+                        v-model="exportParam.dateRange" :editable="false" 
+                        format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
+                        :clearable="true" 
+                        range-separator="至"
+                        type="daterange" 
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                    ></el-date-picker>
+                </el-form-item>
+                
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="exportUserTime" style="width:100%;" >导出</el-button>
+            </div>
+        </el-dialog>
         <!--人员列表 -->
         <el-dialog  :title="(isFill?'已填':'未填')+'人员列表'" v-if="membListVisible" :visible.sync="membListVisible"  width="500px">
             <el-table :show-header="false" :data="fillMembList" highlight-current-row :height="400" style="width: 100%;">
@@ -1127,6 +1149,7 @@
     export default {
         data() {
             return {
+                exportTimeDialog: false,
                 searchKeyword1: '',
                 searchKeyword2: '',
                 monthworkDateS: [],
@@ -2156,6 +2179,9 @@
             showExportDialog() {
                 this.exportDialog = true;
             },
+            showExportTimeDialog() {
+                this.exportTimeDialog = true;
+            },
             changeAllTime() {
                 //总时长发生改变，自动按比例计算
                 this.workForm.domains.forEach(d=>{
@@ -2978,6 +3004,34 @@
             //     }
             //     console.log(tx, '看看值')
             // },
+            //导出员工工时统计
+            exportUserTime() {
+                this.listLoading = true;
+                var param = {};
+                if (this.exportParam.dateRange != null) {
+                    param = {startDate:this.exportParam.dateRange[0], endDate: this.exportParam.dateRange[1]};
+                }
+                this.http.post('/department/exportDeptStatistic', param,
+                res => {
+                    this.listLoading = false;
+                    if (res.code == "ok") {
+                        location.href = res.data;
+                        this.exportTimeDialog = false;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             //导出日报
             exportReport() {
                 this.listLoading = true;

fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/controller/PermissionController.java

@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 public class PermissionController {
     @Autowired
     private PermissionService permissionService;
-    @Autowired
+    @Resource
     private HttpServletRequest httpServletRequest;
     @Resource
     private SysRoleService sysRoleService;
@@ -61,8 +61,8 @@ public class PermissionController {
     }
 
     @RequestMapping("/editRole")
-    public HttpRespMsg editRole(Integer id, @RequestParam String name, @RequestParam String description) {
-        return permissionService.editRole(id, name, description);
+    public HttpRespMsg editRole(Integer id, @RequestParam String name, @RequestParam String description, Integer companyId) {
+        return permissionService.editRole(id, name, description, companyId);
     }
 
     @RequestMapping("/deleteRole")

fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/entity/SysRole.java

@@ -1,23 +1,22 @@
 package com.hssx.user.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-
 /**
  * <p>
  * 角色表(职务)
  * </p>
  *
- * @author Reiskuchen
- * @since 2019-12-11
+ * @author QuYueTing
+ * @since 2022-03-30
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -25,7 +24,7 @@ import java.io.Serializable;
 @TableName("sys_role")
 public class SysRole extends Model<SysRole> {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID=1L;
 
     /**
      * 主键ID
@@ -34,10 +33,10 @@ public class SysRole extends Model<SysRole> {
     private Integer id;
 
     /**
-     * 父级角色
+     * 公司id
      */
-    @TableField("parent_role")
-    private Integer parentRole;
+    @TableField("company_id")
+    private Integer companyId;
 
     /**
      * 角色名称
@@ -51,6 +50,12 @@ public class SysRole extends Model<SysRole> {
     @TableField("role_describe")
     private String roleDescribe;
 
+    /**
+     * 父级角色
+     */
+    @TableField("parent_role")
+    private Integer parentRole;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/service/PermissionService.java

@@ -23,7 +23,7 @@ public interface PermissionService extends IService<Permission> {
 
     HttpRespMsg getRoleList(Integer companyId);
 
-    HttpRespMsg editRole(Integer id, String name, String description);
+    HttpRespMsg editRole(Integer id, String name, String description, Integer companyId);
 
     HttpRespMsg deleteRole(Integer id);
 

fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/service/impl/PermissionServiceImpl.java

@@ -97,9 +97,9 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     }
 
     @Override
-    public HttpRespMsg editRole(Integer id, String name, String description) {
+    public HttpRespMsg editRole(Integer id, String name, String description, Integer companyId) {
         HttpRespMsg msg = new HttpRespMsg();
-        SysRole sysRole = new SysRole().setId(id).setRolename(name).setRoleDescribe(description);
+        SysRole sysRole = new SysRole().setId(id).setRolename(name).setRoleDescribe(description).setCompanyId(companyId);
         if (id == null) {
             long cnt = sysRoleMapper.selectCount(new QueryWrapper<SysRole>().eq("rolename", name));
             if (cnt > 0) {
@@ -147,10 +147,10 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
         //全部模块，
         Company company = companyMapper.selectById(companyId);
         //根据公司所开通的套餐匹配模块
-        List<SysModule> moduleList = sysModuleMapper.selectList(new QueryWrapper<SysModule>().eq("package_type", company.getPackageProject()).orderByAsc("sequence"));
+        List<SysModule> moduleList = sysModuleMapper.selectList(new QueryWrapper<SysModule>().le("package_type", company.getPackageProject()).orderByAsc("orderitem"));
         //组装层级关系，默认只有两级
         List<SysModule> menuList = new ArrayList<>();
-        List<SysFunction> functionList = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().eq("package_type", company.getPackageProject()).orderByAsc("seq"));
+        List<SysFunction> functionList = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().le("package_type", company.getPackageProject()).orderByAsc("seq"));
         //勾选上角色选中的功能
         List<SysRoleFunction> roleFunctionList = sysRoleFunctionMapper.selectList(new QueryWrapper<SysRoleFunction>().eq("role_id", role));
         List<Integer> funIds = roleFunctionList.stream().map(fun -> fun.getFunctionId()).collect(Collectors.toList());

fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/service/impl/UserServiceImpl.java

@@ -198,7 +198,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //返回菜单
         List<SysRoleModule> rModules = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", roleId));
         List<Integer> ids = rModules.stream().map(SysRoleModule::getModuleId).collect(Collectors.toList());
-        List<SysModule> moduleList = sysModuleMapper.selectList(new QueryWrapper<SysModule>().in("id", ids).orderByAsc("sequence"));
+        List<SysModule> moduleList = sysModuleMapper.selectList(new QueryWrapper<SysModule>().in("id", ids).orderByAsc("orderitem"));
         //组装层级关系，默认只有两级
         List<SysModule> menuList = new ArrayList<>();
         for (SysModule module : moduleList) {

fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/utils/CodeGenerator.java

@@ -172,7 +172,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //单独生成逗号隔开
-        strategy.setInclude("company");
+        strategy.setInclude("sys_role");
 
         //全生成
 //        strategy.setExclude();

fhKeeper/formulahousekeeper/user/src/main/resources/mapper/SysRoleMapper.xml

@@ -4,15 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.hssx.user.entity.SysRole">
-        <id column="id" property="id"/>
-        <result column="parent_role" property="parentRole"/>
-        <result column="rolename" property="rolename"/>
-        <result column="role_describe" property="roleDescribe"/>
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="rolename" property="rolename" />
+        <result column="role_describe" property="roleDescribe" />
+        <result column="parent_role" property="parentRole" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, parent_role, rolename, role_describe
+        id, company_id, rolename, role_describe, parent_role
     </sql>
 
 </mapper>