打卡同步时间修改，报表修改

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineAssistantQtyServiceImpl.java

@@ -150,9 +150,9 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
             hours = hours==null?BigDecimal.ZERO:hours;
             assistdto.setProductHour(hours.toString());
             allProHours = allProHours.add(hours);
-
+            //组长工时=产品工时
+            assistdto.setGroupLeaderHour(hours.toString());
         }
-
         for(MesLineAssistantQtyVo assistdto:dtos){
             //工时占比
             assistdto.setHourRatio(new BigDecimal(assistdto.getProductHour())
@@ -182,11 +182,11 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
 //                    );
                     assistdto.setGroupleaderQty("1");
                     //组长工时=当日考勤小时数*工时占比
-                    assistdto.setGroupLeaderHour(
-                            groupleadeHour.multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
-                                    .multiply(new BigDecimal("0.01"))
-                                    .toString()
-                    );
+//                    assistdto.setGroupLeaderHour(
+//                            groupleadeHour.multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
+//                                    .multiply(new BigDecimal("0.01"))
+//                                    .toString()
+//                    );
                     //物料员用人=当日人数*工时占比
                     assistdto.setMaterialQty(new BigDecimal(manQty.getMaterialQty()==null?0L:manQty.getMaterialQty())
                             .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
@@ -255,8 +255,8 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
         MesLineAssistantQty manQty = assistMaps.get(mesLineAssistant.getProductDateStr());
         assistdto0.setMonitorQty(manQty.getMonitorQty()==null?"0":manQty.getMonitorQty().toString());
         assistdto0.setMonitorHour(monitorHour==null?"0":monitorHour.toString());
-        assistdto0.setGroupleaderQty(manQty.getGroupleaderQty()==null?"0":manQty.getGroupleaderQty().toString());
-        assistdto0.setGroupLeaderHour(groupleadeHour==null?"0":groupleadeHour.toString());
+        assistdto0.setGroupleaderQty(manQty.getGroupleaderQty()==null?"0":String.valueOf(dtos.size()));
+        assistdto0.setGroupLeaderHour(groupleadeHour==null?"0":allProHours.toString());
         assistdto0.setMaterialQty(manQty.getMaterialQty()==null?"0":manQty.getMaterialQty().toString());
         assistdto0.setMaterialHour(materialHour==null?"0":materialHour.toString());
         assistdto0.setPillMgrQty(manQty.getPillMgrQty()==null?"0":manQty.getPillMgrQty().toString());
@@ -390,10 +390,11 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
                             monitorHour.divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP).toString());
                     assisHourSum = assisHourSum.add(new BigDecimal(effdto.getMonitorHour()));//DOSUM;
                     //组长用人=当日人数/线体数
-                    effdto.setGroupleaderQty(new BigDecimal(manQty.getGroupleaderQty())
-                            .divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP)
-                            .toString()
-                    );
+//                    effdto.setGroupleaderQty(new BigDecimal(manQty.getGroupleaderQty())
+//                            .divide(new BigDecimal(dtos.size()),2,BigDecimal.ROUND_HALF_UP)
+//                            .toString()
+//                    );
+                    effdto.setGroupleaderQty("1");
                     assisManSum = assisManSum.add(new BigDecimal(effdto.getGroupleaderQty()));//DOSUM;
                     //组长工时=当日考勤小时数/线体数
                     effdto.setGroupleaderHour(

op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.op.system.service.impl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
@@ -672,7 +673,8 @@ public class SysUserServiceImpl implements ISysUserService {
 			DynamicDataSourceContextHolder.push("ds_1000");
 			// 调用 sendPost 方法（确保此方法内部使用 POST 方法发送数据）
 			Map param=new HashMap();
-			param.put("day",DateUtils.getDate());
+			LocalDate yesterdayDate = LocalDate.now().minusDays(1);
+			param.put("day",yesterdayDate);
 			String result = HttpUtils.sendPostForm(attendanceRecordUrl, param);
 			List<MesClockRecord> mesClockRecordList =JSONArray.parseArray(result,MesClockRecord.class);
 			SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -720,5 +722,7 @@ public class SysUserServiceImpl implements ISysUserService {
             sqlSession.close();
         }
     }
+
+
 }