明亦修改

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

@@ -1888,7 +1888,7 @@ public class ReportController {
         }
 
         //成都明夷电子，按比例分配的情况，需要重新计算每日的工作时长和分配的时长
-        if (company.getCompanyName().equals("成都明夷电子科技有限公司") && comTimeType.getType() == 3) {
+        if (company.getCompanyName().equals("成都明夷电子科技股份有限公司") && comTimeType.getType() == 3) {
             for (Report r : reportList) {
                 UserFvTime fvTime = userFvTimeService.getOne(new QueryWrapper<UserFvTime>().eq("work_date", r.getCreateDate()).eq("company_id", user.getCompanyId()).eq("user_id", r.getCreatorId()));
                 if (fvTime == null) {

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

@@ -325,7 +325,7 @@ public class UserFvTimeController {
     }
 
     @RequestMapping("syncAttendanceForMingYi")
-    public HttpRespMsg getAttendanceForMingYi( String startDate,String endDate,String userId, HttpServletRequest request) throws Exception {
+    public HttpRespMsg getAttendanceForMingYi(Integer isBatch,String startDate,String endDate,String userId, HttpServletRequest request) throws Exception {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         JSONObject reqParam = new JSONObject();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
@@ -335,7 +335,7 @@ public class UserFvTimeController {
         DateTimeFormatter time=DateTimeFormatter.ofPattern("HH:mm");
         reqParam.put("startDate",startDate);
         reqParam.put("endDate",endDate);
-        reqParam.put("userId",userId);
+        userList.stream().filter(u->u.getId().equals(userId)).findFirst().ifPresent(u->reqParam.put("userId",u.getJobNumber()));
         HttpHeaders headers = new HttpHeaders();
         String url="http://localhost:10020/attendance/getAttendanceList";
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -382,6 +382,10 @@ public class UserFvTimeController {
                 }
             }
         }
+        if (userFvTimeList.size() == 0 && userFvTimeUpdateList.size() == 0) {
+            httpRespMsg.setError("暂无考勤记录");
+            return httpRespMsg;
+        }
         if(!userFvTimeService.saveBatch(userFvTimeList)){
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
@@ -404,27 +408,45 @@ public class UserFvTimeController {
             }
         }
         int workDayCount = workDaysListInRange.size();
-        HashMap map = new HashMap();
-        map.put("workHours", df.format(sum));
-        map.put("workDayCount", workDayCount);
-        if (workDayCount == 0) {
-            map.put("avgWorkDayHours", 0);
+        if (isBatch == 1) {
+            HashMap map = new HashMap();
+            map.put("workHours", df.format(sum));
+            map.put("workDayCount", workDayCount);
+            if (workDayCount == 0) {
+                map.put("avgWorkDayHours", 0);
+            } else {
+                map.put("avgWorkDayHours", df.format(sum / workDayCount));
+            }
+            httpRespMsg.setData(map);
         } else {
-            map.put("avgWorkDayHours", df.format(sum / workDayCount));
+            //单人单日的获取
+            List<UserFvTime> curUserTimeList = userFvTimeService.list(new QueryWrapper<UserFvTime>()
+                    .eq("user_id", userId).eq("work_date", startDate));
+            System.out.println("userFvTimeList:"+curUserTimeList.size());
+            if (userFvTimeList.size() > 0) {
+                UserFvTime item = userFvTimeList.get(0);
+                httpRespMsg.setData(item);
+            } else {
+                httpRespMsg.setError("暂无考勤记录");
+            }
         }
-        httpRespMsg.setData(map);
         return httpRespMsg;
     }
 
     @RequestMapping("/getMinYiWorkHour")
-    public HttpRespMsg getMinYiWorkHour(HttpServletRequest request, String startDate,String endDate){
+    public HttpRespMsg getMinYiWorkHour(HttpServletRequest request, String startDate,String endDate, String userId){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         DecimalFormat df = new DecimalFormat("#0.0");
         User user = userMapper.selectById(request.getHeader("token"));
         TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
         //根据配置决定是否过滤掉周末
         List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, timeType.getIncludeWeekends());
-        List<UserFvTime> userFvTimeList = userFvTimeService.list(new QueryWrapper<UserFvTime>().in("work_date", workDaysListInRange).eq("company_id", user.getCompanyId()).eq("user_id", user.getId()));
+        List<UserFvTime> userFvTimeList = null;
+        if (workDaysListInRange.size() > 0) {
+            userFvTimeList = userFvTimeService.list(new QueryWrapper<UserFvTime>().in("work_date", workDaysListInRange).eq("company_id", user.getCompanyId()).eq("user_id", userId));
+        } else {
+            userFvTimeList = new ArrayList<>();
+        }
 
         double sum = 0;
         for (LocalDate workDay : workDaysListInRange) {

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

@@ -1763,8 +1763,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
             long end = System.currentTimeMillis();
             List<String> stringList = providerCategoryList.stream().map(ProviderCategory::getProviderCategoryName).distinct().collect(Collectors.toList());
-            //针对成都明夷电子科技有限公司，显示项目日报审核人
-            if (company.getCompanyName().equals("成都明夷电子科技有限公司")) {
+            //针对成都明夷电子科技股份有限公司，显示项目日报审核人
+            if (company.getCompanyName().equals("成都明夷电子科技股份有限公司")) {
                 if(projectIds.size()>0){
                     List<ProjectAuditor> projectAuditorList = projectAuditorMapper.selectList(new LambdaQueryWrapper<ProjectAuditor>().in(ProjectAuditor::getProjectId, projectIds));
                     list.forEach(l->{

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

@@ -1268,7 +1268,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             reportService.saveOrUpdateBatch(reportList);
             //成都明夷电子，需要生成批量记录
             Company company = companyMapper.selectById(companyId);
-            if (company.getCompanyName().equals("成都明夷电子科技有限公司") || timeType.getEnableNewWeeklyfill() == 1 || timeType.getWeeklyChargeFilter() == 1) {//物奇需要填写周总结
+            if (company.getCompanyName().equals("成都明夷电子科技股份有限公司") || timeType.getEnableNewWeeklyfill() == 1 || timeType.getWeeklyChargeFilter() == 1) {//物奇需要填写周总结
                 if (date.contains("@")) {
                     //批量填报
                     String[] split = date.split("\\@");

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

@@ -623,7 +623,7 @@ public class TimingTask {
         JSONObject reqParam = new JSONObject();
         DateTimeFormatter date=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter time=DateTimeFormatter.ofPattern("HH:mm");
-        List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().eq("company_name", "成都明夷电子科技有限公司"));
+        List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().eq("company_name", "成都明夷电子科技股份有限公司"));
         if(companyList.size()>0){
             Company company = companyList.get(0);
             Integer companyId = company.getId();

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

@@ -5022,7 +5022,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         String lastJobNum = null;
         for (Map<String, Object> map : reportList) {
             List<String> item=new ArrayList<>();
-            String departmentName = convertDepartmentIdToCascade(Integer.valueOf(String.valueOf(map.get("departmentId"))), departmentList);
+            String departmentName = map.get("departmentId") == null ? "" : convertDepartmentIdToCascade(Integer.valueOf(String.valueOf(map.get("departmentId"))), departmentList);
             item.add(departmentName);
             String curJobBNum = String.valueOf(map.get("jobNumber"));
             Integer planManNum = map.get("planManNum")==null?0:(Integer) map.get("planManNum");