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

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

@@ -14,5 +14,6 @@ public class TimelinessRateVO {
     private String userName;
     private String departmentName;
     private String timelinessRate;
+    private String jobNumber;
     private List<Map<String,Object>> dataList;
 }

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

@@ -2698,6 +2698,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             headList.add("项目名称");
             headList.add(timeType.getCustomDegreeName());
             headList.add("姓名");
+            headList.add("工号");
             headList.add("部门");
             headList.add("工作日期");
             headList.add("工作时长(h)");
@@ -2721,6 +2722,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 rowData.add((String)map.get("projectName"));
                 rowData.add((String)map.get("degreeName"));
                 rowData.add((String)map.get("username"));
+                rowData.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
                 rowData.add((String)map.get("departmentName"));
                 rowData.add((String)map.get("createDate"));
                 rowData.add(((Double)map.get("workingTime")).toString());
@@ -2742,6 +2744,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             sumRow.add("");
             sumRow.add("");
             sumRow.add("");
+            sumRow.add("");
             sumRow.add(""+df.format(totalWorkTime));
             sumRow.add(""+df.format(totalCostTime));
             if (hasViewSalary) {
@@ -5241,7 +5244,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
         }
         List<Map<String, Object>> list = projectMapper.getUserWorkingTimeList(userId, user.getCompanyId(), startDate, endDate, projectId,null,null,null,deptIds);
-        String[] string={"人员","普通项目工时","公共项目工时","总工时","公共项目工时占比"};
+        String[] string={"人员","工号","普通项目工时","公共项目工时","总工时","公共项目工时占比"};
         List<List<String>> dataList=new ArrayList<>();
         dataList.add(Arrays.asList(string));
         for(Map<String,Object> item:list){
@@ -5252,6 +5255,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             BigDecimal divide = bdIsPublic.divide(BigDecimal.valueOf(workingTime),2,BigDecimal.ROUND_HALF_UP);
             NumberFormat nf = NumberFormat.getPercentInstance();
             subList.add(String.valueOf(item.get("username")));
+            subList.add(String.valueOf(StringUtils.isEmpty(item.get("jobNumber"))?"":item.get("jobNumber")));
             subList.add(String.valueOf(item.get("unPublic")));
             subList.add(String.valueOf(item.get("isPublic")));
             subList.add(String.valueOf(item.get("workingTime")));
@@ -5334,6 +5338,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     &&(ls.getEndDate().isBefore(ChronoLocalDate.from(eDate))||ls.getEndDate().isEqual(ChronoLocalDate.from(eDate)))).collect(Collectors.toList());
             TimelinessRateVO timelinessRateVO=new TimelinessRateVO();
             timelinessRateVO.setUserName(user.getName());
+            timelinessRateVO.setJobNumber(user.getJobNumber());
             timelinessRateVO.setTimelinessRate(String.valueOf(dft.format(0)));
             Optional<Department> first = departmentList.stream().filter(dp -> dp.getDepartmentId().equals(user.getDepartmentId())).findFirst();
             if(first.isPresent()){
@@ -5449,13 +5454,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         HttpRespMsg msg = getUserReportTimelinessRate(request, startDate, endDate, null, null, null, null);
         HashMap map= (HashMap) msg.data;
         List<TimelinessRateVO> list = (List<TimelinessRateVO>) map.get("list");
-        String[] s={"人员","部门","填报及时率"};
+        String[] s={"人员","工号","部门","填报及时率"};
         List<String> titleString = Arrays.asList(s);
         List<List<String>> dataList=new ArrayList<>();
         dataList.add(titleString);
         for (TimelinessRateVO timelinessRateVO : list) {
             List<String> item=new ArrayList<>();
             item.add(timelinessRateVO.getUserName());
+            item.add(timelinessRateVO.getJobNumber());
             item.add(timelinessRateVO.getDepartmentName());
             item.add(timelinessRateVO.getTimelinessRate());
             dataList.add(item);
@@ -5632,6 +5638,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<List<String>> dataList=new ArrayList<>();
         List<String> titleList=new ArrayList<>();
         titleList.add("姓名");
+        titleList.add("工号");
         titleList.add("部门");
         titleList.add("计划工时");
         titleList.add("实际工时");
@@ -5640,6 +5647,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for (Map<String, Object> map : resultList) {
             List<String> item=new ArrayList<>();
             item.add((String) map.get("name"));
+            item.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
             item.add((String) map.get("departmentName")==null?"":(String) map.get("departmentName"));
             item.add(String.valueOf(map.get("planHours")).equals("null")?"":String.valueOf(map.get("planHours")));
             item.add(String.valueOf(map.get("workingTime")).equals("null")?"":String.valueOf(map.get("workingTime")));

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

@@ -139,6 +139,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private DepartmentOtherManagerMapper departmentOtherManagerMapper;
     @Resource
     private LocaleInformationMapper localeInformationMapper;
+    @Resource
+    private CompanyReportMapper companyReportMapper;
     //登录网页端
     @Override
     public HttpRespMsg loginAdmin(String username, String password) {
@@ -622,6 +624,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 setting.setCompanyId(company.getId());
                 projectBasecostSettingMapper.insert(setting);
             }
+            //生成项目报表服务默认条目
+            Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
+            for (Integer integerItem : arrayInteger) {
+                CompanyReport companyReport=new CompanyReport();
+                companyReport.setCompanyId(company.getId());
+                companyReport.setReportFormId(integerItem);
+                companyReportMapper.insert(companyReport);
+            }
             //生成费用报销默认条目
             String[] expenseTypes = Constant.EXPENSE_TYPES;
             List<String> commonly = new ArrayList<>();

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

@@ -643,7 +643,7 @@
     <!-- 获取某个员工的某时间段内的加班详情 -->
     <select id="getOvertimeDetail" resultType="java.util.Map">
         SELECT date_format(report.`create_date`, '%Y-%m-%d') AS createDate,
-        report.`creator_id` AS userId, user.`name` AS username, report.`working_time` AS workingTime,
+        report.`creator_id` AS userId, user.`name` AS username,user.job_number as jobNumber, report.`working_time` AS workingTime,
         IFNULL(report.`overtime_hours`, 0) AS overtimeHours,project.id as projectId,
         project.project_name as projectName,project.project_code as projectCode,
         IFNULL(report.overtime_cost, 0) AS cost,
@@ -678,7 +678,7 @@
 
     <!--获取人员工时-->
     <select id="getUserWorkingTimeList" resultType="java.util.Map">
-        SELECT  report.`creator_id` AS userId, user.`name` AS username,
+        SELECT  report.`creator_id` AS userId, user.`name` AS username,user.job_number as jobNumber,
         ifnull(SUM(if(project.is_public=0,report.working_time,null)),0) as unPublic,
         ifnull(SUM(if(project.is_public=1,report.working_time,null)),0) as isPublic,
         ifnull(SUM(report.`working_time`),0) AS workingTime
@@ -987,7 +987,7 @@
     </select>
 
     <select id="getUserWorkingTimeStatic" resultType="java.util.Map">
-        select us.name,dp.department_name as departmentName,
+        select us.name,us.job_number as jobNumber,dp.department_name as departmentName,
         (select SUM(te.plan_hours) from task_executor te
         left join task on task.id=te.task_id
         where te.executor_id=us.id