Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -3,10 +3,11 @@ package com.management.platform.controller;
 
 import com.management.platform.service.CompanyService;
 import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  *  前端控制器
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/company")
 public class CompanyController {
-    @Autowired
+    @Resource
     private CompanyService companyService;
     @RequestMapping("/dataMigration")
     public HttpRespMsg dataMigration(Integer oldCompanyId,Integer targetCompanyId){

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

@@ -79,13 +79,13 @@ public class PermissionController {
     }
 
     @RequestMapping("/getAuthority")
-    public HttpRespMsg getAuthority(@RequestParam Integer role, @RequestParam Integer companyId) {
-        return permissionService.getAuthority(role, companyId);
+    public HttpRespMsg getAuthority(@RequestParam Integer role, @RequestParam Integer companyId,HttpServletRequest request) {
+        return permissionService.getAuthority(role, companyId,request);
     }
 
     @RequestMapping("/exportData")
-    public HttpRespMsg exportData(@RequestParam Integer role, @RequestParam Integer companyId){
-        return permissionService.exportData(role,companyId);
+    public HttpRespMsg exportData(@RequestParam Integer role, @RequestParam Integer companyId,HttpServletRequest request){
+        return permissionService.exportData(role,companyId,request);
     }
 
     @RequestMapping("/switchAuthority")

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

@@ -194,6 +194,10 @@ public class ReportExtraDegreeController {
                         (pro.getAssociateDegreeNames().equals(degree.getName()) || pro.getAssociateDegreeNames().startsWith(degree.getName()+",")
                             || pro.getAssociateDegreeNames().contains(","+degree.getName()+",")
                             || pro.getAssociateDegreeNames().endsWith(","+degree.getName()))).map(Project::getProjectName).collect(Collectors.joining(",")));
+                degree.setProjectNum((int) allProjects.stream().filter(pro->pro.getAssociateDegreeNames() != null &&
+                        (pro.getAssociateDegreeNames().equals(degree.getName()) || pro.getAssociateDegreeNames().startsWith(degree.getName()+",")
+                                || pro.getAssociateDegreeNames().contains(","+degree.getName()+",")
+                                || pro.getAssociateDegreeNames().endsWith(","+degree.getName()))).count());
             }
         }
 

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

@@ -695,7 +695,7 @@ public class TaskController {
      * @return
      */
     @RequestMapping("/listByPage")
-    public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize) {
+    public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize,Integer type) {
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
@@ -709,6 +709,9 @@ public class TaskController {
             //我创建的任务
             queryWrapper.eq("creater_id", userId);
         }
+        if(type!=null){
+            queryWrapper.eq("task_type",type);
+        }
 //        else if (viewId == 3) {
 //            //今天的任务
 //            queryWrapper.eq("end_date", LocalDate.now());

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

@@ -1,14 +1,15 @@
 package com.management.platform.entity;
 
 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 com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -42,6 +43,9 @@ public class ReportExtraDegree extends Model<ReportExtraDegree> {
     @TableField(exist = false)
     private String projects;
 
+    @TableField(exist = false)
+    private Integer projectNum;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -27,7 +27,7 @@ public interface PermissionService extends IService<Permission> {
 
     HttpRespMsg deleteRole(Integer id);
 
-    HttpRespMsg getAuthority(Integer role, Integer companyId);
+    HttpRespMsg getAuthority(Integer role, Integer companyId,HttpServletRequest request);
 
     HttpRespMsg switchAuthority(Integer role, Integer id);
 
@@ -35,5 +35,5 @@ public interface PermissionService extends IService<Permission> {
 
     HttpRespMsg setDefaultRole(Integer id, Integer companyId);
 
-    HttpRespMsg exportData(Integer role, Integer companyId);
+    HttpRespMsg exportData(Integer role, Integer companyId,HttpServletRequest request);
 }

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

@@ -53,7 +53,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     @Resource
     private LeaveSheetMapper leaveSheetMapper;
     @Resource
-    private AuditWorkflowSetting auditWorkflowSetting;
+    private AuditWorkflowSettingMapper auditWorkflowSettingMapper;
     //新增部门
     @Override
     public HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,  HttpServletRequest request) {
@@ -197,7 +197,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 httpRespMsg.setError("当前部门已被工时审批流数据使用");
                 return httpRespMsg;
             }
-            Integer auditWorkflowSettingCut = auditWorkflowSetting.selectCount(new QueryWrapper<AuditWorkflowSetting>().eq("audit_dept_id", departmentId));
+            Integer auditWorkflowSettingCut = auditWorkflowSettingMapper.selectCount(new QueryWrapper<AuditWorkflowSetting>().eq("audit_dept_id", departmentId));
             if(auditWorkflowSettingCut>0){
                 httpRespMsg.setError("当前部门已被请假出差审批流数据使用");
                 return httpRespMsg;

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

@@ -151,86 +151,99 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     }
 
     @Override
-    public HttpRespMsg getAuthority(Integer role, Integer companyId) {
+    public HttpRespMsg getAuthority(Integer role, Integer companyId,HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-
+        User user = userMapper.selectById(request.getHeader("token"));
         //角色赋有的module
         List<Integer> modelIds = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", role)).stream().map(sr -> sr.getModuleId()).collect(Collectors.toList());
-
         //全部模块，
         Company company = companyMapper.selectById(companyId);
         TimeType timeType = timeTypeMapper.selectById(companyId);
         //按照公司开通的模块进行匹配
-        QueryWrapper<SysModule> queryWrapper = new QueryWrapper<SysModule>().eq("package_time", 1);
-        if (company.getPackageProject() == 1) {
-            queryWrapper.or().eq("package_project", 1);
-        }
-        if (company.getPackageOa() == 1) {
-            queryWrapper.or().eq("package_oa", 1);
-        }
-        if (company.getPackageExpense() == 1) {
-            queryWrapper.or().eq("package_expense", 1);
-        }
-        if (company.getPackageCustomer() == 1) {
-            queryWrapper.or().eq("package_customer", 1);
-        }
-        if (company.getPackageEngineering() == 1) {
-            queryWrapper.or().eq("package_engineering", 1);
-        }
-        if (company.getPackageContract() == 1) {
-            queryWrapper.or().eq("package_contract", 1);
-        }
-        if (company.getPackageEtimecard()== 1) {
-            queryWrapper.or().eq("package_etimecard", 1);
-        }
-        if (company.getPackageFinance() == 1) {
-            queryWrapper.or().eq("package_finance", 1);
-        }
-        if (timeType.getReportWorkflow() == 1) {
-            queryWrapper.or().eq("report_workflow", 1);
-        }
-        if (timeType.getNeedDeptAudit() == 1) {
-            queryWrapper.or().eq("need_dept_audit", 1);
+        QueryWrapper<SysModule> queryWrapper = new QueryWrapper<SysModule>().and(wrapper->{
+            wrapper.eq("package_time", 1);
+            if (company.getPackageProject() == 1) {
+                wrapper.or().eq("package_project", 1);
+            }
+            if (company.getPackageOa() == 1) {
+                wrapper.or().eq("package_oa", 1);
+            }
+            if (company.getPackageExpense() == 1) {
+                wrapper.or().eq("package_expense", 1);
+            }
+            if (company.getPackageCustomer() == 1) {
+                wrapper.or().eq("package_customer", 1);
+            }
+            if (company.getPackageEngineering() == 1) {
+                wrapper.or().eq("package_engineering", 1);
+            }
+            if (company.getPackageContract() == 1) {
+                wrapper.or().eq("package_contract", 1);
+            }
+            if (company.getPackageEtimecard()== 1) {
+                wrapper.or().eq("package_etimecard", 1);
+            }
+            if (company.getPackageFinance() == 1) {
+                wrapper.or().eq("package_finance", 1);
+            }
+            if (timeType.getReportWorkflow() == 1) {
+                wrapper.or().eq("report_workflow", 1);
+            }
+            if (timeType.getNeedDeptAudit() == 1) {
+                wrapper.or().eq("need_dept_audit", 1);
+            }
+            return wrapper;
+        });
+        List<SysRoleModule> sysRoleModuleList = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", user.getRoleId()));
+        List<Integer> moduleIds = sysRoleModuleList.stream().map(sm -> sm.getModuleId()).collect(Collectors.toList());
+        if(!user.getRoleName().equals("超级管理员")){
+            queryWrapper.and(wrapper->wrapper.in("id",moduleIds));
         }
         queryWrapper.orderByAsc("orderitem");
-
         List<SysModule> moduleList = sysModuleMapper.selectList(queryWrapper);
         //组装层级关系，默认只有两级
         List<SysModule> menuList = new ArrayList<>();
-        QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().eq("package_time", 1);
-        if (company.getPackageProject() == 1) {
-            functionQueryWrapper.or().eq("package_project", 1);
-        }
-        if (company.getPackageOa() == 1) {
-            functionQueryWrapper.or().eq("package_oa", 1);
-        }
-        if (company.getPackageExpense() == 1) {
-            functionQueryWrapper.or().eq("package_expense", 1);
-        }
-        if (company.getPackageCustomer() == 1) {
-            functionQueryWrapper.or().eq("package_customer", 1);
-        }
-        if (company.getPackageEngineering() == 1) {
-            functionQueryWrapper.or().eq("package_engineering", 1);
-        }
-        if (company.getPackageContract() == 1) {
-            functionQueryWrapper.or().eq("package_contract", 1);
-        }
-        if (company.getPackageEtimecard()== 1) {
-            functionQueryWrapper.or().eq("package_etimecard", 1);
-        }
-        if (company.getPackageFinance() == 1) {
-            functionQueryWrapper.or().eq("package_finance", 1);
-        }
-        if (timeType.getSyncCorpwxTime() == 1) {
-            functionQueryWrapper.or().eq("sync_corpwx_time", 1);
-        }
-        //开通财务审核功能的
-        if (timeType.getFinanceAudit() == 1) {
-            functionQueryWrapper.or().eq("finance_audit", 1);
+        QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper->{
+            wrapper.eq("package_time", 1);
+            if (company.getPackageProject() == 1) {
+                wrapper.or().eq("package_project", 1);
+            }
+            if (company.getPackageOa() == 1) {
+                wrapper.or().eq("package_oa", 1);
+            }
+            if (company.getPackageExpense() == 1) {
+                wrapper.or().eq("package_expense", 1);
+            }
+            if (company.getPackageCustomer() == 1) {
+                wrapper.or().eq("package_customer", 1);
+            }
+            if (company.getPackageEngineering() == 1) {
+                wrapper.or().eq("package_engineering", 1);
+            }
+            if (company.getPackageContract() == 1) {
+                wrapper.or().eq("package_contract", 1);
+            }
+            if (company.getPackageEtimecard()== 1) {
+                wrapper.or().eq("package_etimecard", 1);
+            }
+            if (company.getPackageFinance() == 1) {
+                wrapper.or().eq("package_finance", 1);
+            }
+            if (timeType.getSyncCorpwxTime() == 1) {
+                wrapper.or().eq("sync_corpwx_time", 1);
+            }
+            //开通财务审核功能的
+            if (timeType.getFinanceAudit() == 1) {
+                wrapper.or().eq("finance_audit", 1);
+            }
+            return wrapper;
+        });
+        List<SysRoleFunction> sysRoleFunctionList = sysRoleFunctionMapper.selectList(new QueryWrapper<SysRoleFunction>().eq("role_id", user.getRoleId()));
+        List<Integer> functionIds = sysRoleFunctionList.stream().map(sf -> sf.getFunctionId()).collect(Collectors.toList());
+        if(!user.getRoleName().equals("超级管理员")){
+            functionQueryWrapper.and(funWrapper->funWrapper.in("id",functionIds));
         }
         functionQueryWrapper.orderByAsc("seq");
-
         List<SysFunction> functionList = sysFunctionMapper.selectList(functionQueryWrapper);
         //勾选上角色选中的功能
         List<SysRoleFunction> roleFunctionList = sysRoleFunctionMapper.selectList(new QueryWrapper<SysRoleFunction>().eq("role_id", role));
@@ -341,8 +354,8 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     }
 
     @Override
-    public HttpRespMsg exportData(Integer role, Integer companyId) {
-        HttpRespMsg msg = getAuthority(role, companyId);
+    public HttpRespMsg exportData(Integer role, Integer companyId,HttpServletRequest request) {
+        HttpRespMsg msg = getAuthority(role, companyId,request);
         SysRole roleItem = sysRoleMapper.selectById(role);
         List<SysModule> menuList= (List<SysModule>) msg.data;
         HSSFWorkbook wb=new HSSFWorkbook();

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

@@ -1658,20 +1658,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             user.put("id", u.getId());
             user.put("name", u.getName());
             user.put("departmentId", u.getDepartmentId());
-            List<Map<String, Object>> mapList = reportNameByDate.stream().filter(r -> r.get("id").equals(u.getId())).collect(Collectors.toList());
             Optional<Map<String, Object>> first = reportNameByDate.stream().filter(r -> r.get("id").equals(u.getId())).findFirst();
-            BigDecimal bigDecimal=new BigDecimal(0);
-            for (Map<String, Object> map : mapList) {
-                bigDecimal=bigDecimal.add(BigDecimal.valueOf((Double) map.get("workingTime")));
-            }
-            boolean b = reportNameByDate.stream().anyMatch(r -> r.get("state").equals(1));
-            if (b) {
-                user.put("state",1);
-                user.put("workingTime",bigDecimal);
-            }
-            if(first.isPresent()&&!b){
-                user.put("state",first.get().get("state"));
-                user.put("workingTime",bigDecimal);
+
+            if (first.isPresent()) {
+                user.put("state", first.get().get("state"));
+                user.put("workingTime", first.get().get("workingTime"));
             }
             userMapList.add(user);
         }

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

@@ -388,7 +388,7 @@
         <if test="leaderId != null and leaderId != ''">
             AND (a.project_auditor_id = #{leaderId} or project.incharger_id = #{leaderId})
         </if>
-        group by a.creator_id,a.id
+        group by a.creator_id
     </select>
 
     <!--根据日期,部门，指定人员获取报告上传人-->