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

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

@@ -573,9 +573,12 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         //计算税额
                         BigDecimal bd = new BigDecimal(amountCell.getNumericCellValue());
                         bigDecimal=bigDecimal.add(BigDecimal.valueOf(amountCell.getNumericCellValue()));
+
                         if (taxPercentCell != null) {
+                            //税率是加百分号后显示的数据
+                            BigDecimal taxRate = new BigDecimal(taxPercentCell.getNumericCellValue()).divide(new BigDecimal(100));
                             //原始金额
-                            BigDecimal divide = bd.divide(BigDecimal.valueOf((1 + taxPercentCell.getNumericCellValue())),2,BigDecimal.ROUND_HALF_UP);
+                            BigDecimal divide = bd.divide(taxRate.add(new BigDecimal(1)),2,BigDecimal.ROUND_HALF_UP);
                             BigDecimal subtract = bd.subtract(divide);
                             expenseItem.setTaxValue(subtract.doubleValue());
                         }

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

@@ -3413,7 +3413,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //dataItem.add(userMonthWork.name+(worktimeList.size()==0?"(未填)":""));
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 dataItem.add("$userName="+(userMonthWork.corpwxUserId==null?"":userMonthWork.corpwxUserId)+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
-                dataItem.add("$departmentName="+(userMonthWork.corpwxDeptId==null?"":userMonthWork.corpwxDeptId)+"$");
+                dataItem.add("$departmentName="+(userMonthWork.departmentName==null?"":userMonthWork.departmentName)+"$");
             }else {
                 dataItem.add(userMonthWork.name+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
                 dataItem.add(userMonthWork.departmentName);

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

@@ -438,12 +438,25 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 if (row == null) {
                     continue;
                 }
+                if (ExcelUtil.isRowEmpty(row)) {
+                    continue;
+                }
+                System.out.println("rowIndex==="+rowIndex);
+                XSSFCell nameCell = row.getCell(1);
+                if (nameCell == null) {
+                    break;
+                }
+                System.out.println("name==="+nameCell.getStringCellValue());
                 XSSFCell executorCell = row.getCell(3);
-                String[] executorNameArray = executorCell.getStringCellValue().split(",");
-                for (String s : executorNameArray) {
-                    if(!userNameList.contains(s)&&!s.equals("")&&!s.equals("执行人")){
-                        userNameList.add(s);
+                if (executorCell != null) {
+                    String[] executorNameArray = executorCell.getStringCellValue().split(",");
+                    for (String s : executorNameArray) {
+                        if(!userNameList.contains(s)&&!s.equals("")&&!s.equals("执行人")){
+                            userNameList.add(s);
+                        }
                     }
+                } else {
+                    System.out.println("===执行人为空===");
                 }
             }
             System.out.println("参与搜素的人员列表"+userNameList + userNameList.size());

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

@@ -550,6 +550,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         for (SysRoleFunction sysRoleFunction : funList) {
             functionIdList.add(sysRoleFunction.getFunctionId());
         }
+        //获取当前公司开启了得报表
+        List<CompanyReport> companyReportList = companyReportMapper.selectList(new QueryWrapper<CompanyReport>().eq("company_id", company.getId()));
+        List<Integer> formIds = companyReportList.stream().map(CompanyReport::getReportFormId).collect(Collectors.toList());
         if (functionIdList.size() > 0) {
             //根据功能id获取可用的操作代码
             QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().eq("package_time", 1);
@@ -584,8 +587,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 functionQueryWrapper.or().eq("finance_audit", 1);
             }
             functionQueryWrapper.orderByAsc("seq");
-
             List<SysFunction> functionList = sysFunctionMapper.selectList(functionQueryWrapper);
+            functionList=functionList.stream().filter(fl->fl.getReportFormId()==null||(fl.getReportFormId()!=null&&formIds.contains(fl.getReportFormId()))).collect(Collectors.toList());
             functionList = functionList.stream().filter(f->functionIdList.contains(f.getId())).collect(Collectors.toList());
             user.setFunctionList(functionList);
         } else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/ExcelUtil.java

@@ -409,7 +409,7 @@ public class ExcelUtil {
         for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
             Cell cell = row.getCell(i);
             if (cell != null && cell.getCellTypeEnum() != CellType.BLANK){
-                System.out.println(i+":"+cell.getCellTypeEnum());
+//                System.out.println(i+":"+cell.getCellTypeEnum());
                 return false;
             }
         }

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

@@ -3715,6 +3715,7 @@ overflow: auto;
 .user_name_icon {
     text-align:center;border-radius:50%;color:white;float:right;font-size:10px;width:30px;height:30px;line-height:30px;
     transform: scale(0.8);
+    overflow: hidden;
 }
 .task_name {
     color:#262626;

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

@@ -424,7 +424,7 @@
                         <div class="player">
                             <p @click="chan">{{ $t('participantin') }}</p>
                             <span  v-for="(pl, i) in critic" :key="i">
-                            <div class="bj" style="width: 14%;">
+                            <div class="bj" style="width: 14%;overflow: hidden;">
                                 <span style="background: #778899" v-if="user.userNameNeedTranslate != '1'">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
                                 <span style="background: #778899" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='pl'></ww-open-data></span>
                             </div>