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

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

@@ -742,7 +742,7 @@ public class TaskController {
 //            queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
 //        }
         List<Task> list = taskMapper.getTaskWithProjectName(queryWrapper, (pageIndex-1)*pageSize, pageSize,companyId,groupName);
-        int total = taskMapper.selectCount(queryWrapper);;
+        int total = taskMapper.selectCount(queryWrapper);
         Map<String, Object> map = new HashMap<>();
         map.put("records", list);
         map.put("total", total);

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

@@ -1,20 +1,20 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 
@@ -203,6 +203,8 @@ public class Task extends Model<Task> {
     private List<MilestoneTaskRef> refTaskList;
     @TableField(exist = false)
     private Integer finishRefTaskCount;
+    @TableField(exist = false)
+    private String projectCategorySub;
 
     @Override
     protected Serializable pkVal() {

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

@@ -60,6 +60,8 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     private SysRoleModuleService sysRoleModuleService;
     @Resource
     private CompanyMapper companyMapper;
+    @Resource
+    private CompanyReportMapper companyReportMapper;
 
 
     //根据角色id获取角色列表
@@ -253,13 +255,19 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
         List<SysFunction> functionList = sysFunctionMapper.selectList(functionQueryWrapper);
         //勾选上角色选中的功能
         List<SysRoleFunction> roleFunctionList = sysRoleFunctionMapper.selectList(new QueryWrapper<SysRoleFunction>().eq("role_id", role));
+        //获取当前公司开启了得报表
+        List<CompanyReport> companyReportList = companyReportMapper.selectList(new QueryWrapper<CompanyReport>().eq("company_id", companyId));
+        List<Integer> formIds = companyReportList.stream().map(CompanyReport::getReportFormId).collect(Collectors.toList());
         List<Integer> funIds = roleFunctionList.stream().map(fun -> fun.getFunctionId()).collect(Collectors.toList());
-        functionList.stream().forEach(fun -> {
+        List<SysFunction> resultFunList=new ArrayList<>();
+        for (SysFunction fun : functionList) {
             if (funIds.contains(fun.getId())) {
                 fun.setChecked(true);
             }
-        });
-
+            if(fun.getReportFormId()==null||(fun.getReportFormId()!=null&&formIds.contains(fun.getReportFormId()))){
+                resultFunList.add(fun);
+            }
+        }
         for (SysModule module : moduleList) {
             if (module.getParentId() == null) {
                 menuList.add(module);
@@ -268,7 +276,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
                 module.setChecked(true);
             }
             //赋予菜单对应功能列表
-            module.setFunctionList(functionList.stream().filter(item -> item.getModuleId().equals(module.getId())).collect(Collectors.toList()));
+            module.setFunctionList(resultFunList.stream().filter(item -> item.getModuleId().equals(module.getId())).collect(Collectors.toList()));
         }
         for (SysModule mainMenu : menuList) {
             List<SysModule> list = moduleList.stream().filter(mod -> mainMenu.getId().equals(mod.getParentId())).collect(Collectors.toList());

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

@@ -152,14 +152,14 @@ public class ProviderInfoServiceImpl extends ServiceImpl<ProviderInfoMapper, Pro
     public HttpRespMsg exportData(HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("token"));
         List<List<String>> dataList=new ArrayList<>();
-        String[] titleString=new String[]{"供应商名称","供应商编码","分类","联系人","联系人电话","邮箱","地址","备注"};
+        String[] titleString=new String[]{"供应商编号","供应商名称","分类","联系人","联系电话","邮箱","地址","备注"};
         List<String> titleList = Arrays.asList(titleString);
         dataList.add(titleList);
         List<ProviderInfo> providerInfoList = providerInfoMapper.selectList(new QueryWrapper<ProviderInfo>().eq("company_id", user.getCompanyId()));
         for (ProviderInfo providerInfo : providerInfoList) {
             List<String> item=new ArrayList<>();
-            item.add(providerInfo.getProviderName()==null?"":providerInfo.getProviderName());
             item.add(providerInfo.getProviderCode()==null?"":providerInfo.getProviderCode());
+            item.add(providerInfo.getProviderName()==null?"":providerInfo.getProviderName());
             item.add(providerInfo.getProviderCategoryName()==null?"":providerInfo.getProviderCategoryName());
             item.add(providerInfo.getContactName()==null?"":providerInfo.getContactName());
             item.add(providerInfo.getContactPhone()==null?"":providerInfo.getContactPhone());

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

@@ -1305,6 +1305,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             headCell.setCellValue("时薪");
             headCell.setCellStyle(headStyle);
             headCell = headRow.createCell(7);
+            headCell.setCellValue("证书");
+            headCell.setCellStyle(headStyle);
+            headCell = headRow.createCell(8);
             headCell.setCellValue("状态");
             headCell.setCellStyle(headStyle);
 
@@ -1320,6 +1323,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             }
             List<User> data = userMapper.selectList(queryWrapper);
             List<Department> deptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
+            List<String> collect = data.stream().distinct().map(da -> da.getId()).collect(Collectors.toList());
+            List<UserCert> userCertList=new ArrayList<>();
+            if(collect!=null&&!StringUtils.isEmpty(data)){
+                userCertList = userCertMapper.selectList(new QueryWrapper<UserCert>().in("user_id", collect));
+            }
             for (User item : data) {
                 if (item.getDepartmentId() != 0) {
                     Optional<Department> first = deptList.stream().filter(d -> d.getDepartmentId().equals(item.getDepartmentId())).findFirst();
@@ -1336,8 +1344,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 row.createCell(4).setCellValue(item.getDepartmentName());
                 row.createCell(5).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
                 row.createCell(6).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
-                row.createCell(7).setCellValue(item.getIsActive()==1?"正常":"已停用");
-
+                List<UserCert> certList = userCertList.stream().distinct().filter(uc -> uc.getUserId().equals(item.getId())).collect(Collectors.toList());
+                if(certList.size()>0){
+                    String s="";
+                    for (int i = 0; i < certList.size(); i++) {
+                        if(i<certList.size()-1){
+                            s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate()+",";
+                        }else {
+                            s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate();
+                        }
+                    }
+                    row.createCell(7).setCellValue(s);
+                }else {
+                    row.createCell(7).setCellValue("");
+                }
+                row.createCell(8).setCellValue(item.getIsActive()==1?"正常":"已停用");
                 rowNum++;
             }
             //生成Excel文件

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

@@ -87,6 +87,7 @@
         <result column="project_name" property="projectName" />
         <result column="start_date" property="startDate" />
         <result column="stages_name" property="stagesName" />
+        <result column="project_category_sub" property="projectCategorySub" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -197,7 +198,11 @@
     </select>
 
     <select id="getTaskWithProjectName" resultMap="RichResultMap">
-        SELECT task.*, project.`project_name`, stages.stages_name FROM task LEFT JOIN project ON project.id = task.`project_id`
+        SELECT task.*, project.`project_name`, stages.stages_name
+        <if test="companyId==428">
+            ,ps.project_category_sub
+        </if>
+        FROM task LEFT JOIN project ON project.id = task.`project_id`
         left join stages on stages.id = task.stages_id
         <if test="companyId==428">
             left join project_separate ps on ps.id=task.project_id

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

@@ -440,7 +440,6 @@
                     <el-input id="outputValue" v-model="addForm.outputValue" style="width:32%;"
                     placeholder="" clearable  @keyup.native="restrictNumber('outputValue')">
                     </el-input><span style="margin-left:10px;">元</span>
-
                 </el-form-item>
 
                 <!-- 单个公司的固定字段 -->

fhKeeper/formulahousekeeper/timesheet/src/views/provider/provider.vue

@@ -29,7 +29,7 @@
                         {{scope.$index+1+(page-1)*size}}
                     </template> -->
             </el-table-column>
-            <el-table-column prop="providerCode" label="供应商编码"  width="200" sortable="custom"></el-table-column>
+            <el-table-column prop="providerCode" label="供应商编号"  width="200" sortable="custom"></el-table-column>
             <el-table-column prop="providerName" label="供应商名称" width="200" sortable="custom"></el-table-column>
             <el-table-column prop="providerCategoryName" label="供应商分类" width="200" sortable="custom"></el-table-column>
             <el-table-column prop="contactName" label="联系人"  width="120"></el-table-column>

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -109,7 +109,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    
+                    <el-table-column prop="projectCategorySub" label="项目分组" sortable width="300" v-if="user.companyId == '428'"></el-table-column>
                     <el-table-column prop="projectName" label="项目名称" sortable width="260" show-overflow-tooltip>
                         <template slot-scope="scope">
                             <el-link type="primary" :href="'#/projectInside/'+scope.row.projectId">{{scope.row.projectName}}</el-link>