1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -60,7 +60,7 @@ public interface ReportMapper extends BaseMapper<Report> {
                                                              @Param("endDate") String endDate, @Param("projectId") Integer projectId,@Param("stateKey")Integer stateKey,@Param("branchDepartment")List<Integer> branchDepartment);
 
     //按当前人员获取本人报告
-    List<Map<String, Object>> getReportByDate(@Param("date") String date, @Param("id") String id);
+    List<ReportVO> getReportByDate(@Param("date") String date, @Param("id") String id);
     //获取项目经理所管理的人员的报告
     List<Map<String, Object>> getInchargeReportByDate(@Param("date") String date, @Param("id") String id, @Param("state") Integer state);
 

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

@@ -702,9 +702,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 //todo:推送到企业微信
                 StringBuilder stringBuilder=new StringBuilder();
                 stringBuilder.append("工序  ");
-                stringBuilder.append("工序名称："+prodProcedure.getName()+"\n"
-                        +"    产品名称:"+product.getName()+"\n"
-                        +"    排产工单号:"+plan.getProductSchedulingNum());
+                stringBuilder.append("工序名称： "+prodProcedure.getName()+"\n"
+                        +"       产品名称:"+product.getName()+"\n"
+                        +"       排产工单号:"+plan.getProductSchedulingNum());
                 wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,userIds,stringBuilder.toString(),"todayPlan",null);
             }
         }

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

@@ -233,7 +233,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if (functionList.size() == 0) {
                 String leaderId = user.getId();
                 //不是项目经理，只看自己的报告
-                List<Map<String, Object>> list = new ArrayList<>();
+                List<ReportVO> list = new ArrayList<>();
                 //没有指定员工或者指定的就是自己
                 if (targetUid == null || targetUid.equals(user.getId())) {
                     //查看自己的日报
@@ -248,10 +248,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         double reportTime = 0;
                         BigDecimal total = new BigDecimal(0);
                         int state = 1;
-                        for (Map<String, Object> m : list) {
-                            double t = (double) m.get("time");
+                        for (ReportVO m : list) {
+                            double t = m.getWorkingTime();
                             reportTime += t;
-                            total = total.add((BigDecimal)m.get("cost"));
+                            total = total.add(m.getCost());
                         }
 
                         DecimalFormat df = new DecimalFormat("0.00");