Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

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

@@ -12161,9 +12161,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<String> list=new ArrayList<>();
         for (LaborHourRateVo laborHourRateVo : resultList) {
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                list.add(laborHourRateVo.getDepartment_name());
-            }else {
                 list.add("$departmentName="+laborHourRateVo.getDepartment_name()+"$");
+            }else {
+                list.add(laborHourRateVo.getDepartment_name());
             }
             list.add(String.valueOf(laborHourRateVo.getWorking_time()));
             list.add(String.valueOf(laborHourRateVo.getCount()));

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

@@ -4574,6 +4574,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<String> titleList=new ArrayList<>();
         titleList.add("排产计划");
         titleList.add("工长");
+        titleList.add("计划件数");
+        titleList.add("产品名称");
+        titleList.add("开始日期");
+        titleList.add("完工日期");
+        titleList.add("工位");
         titleList.add("计划工时");
         titleList.add("当前工时");
         titleList.add("进度");
@@ -4582,6 +4587,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<String> itemMap=new ArrayList<>();
             itemMap.add(String.valueOf(map.get("taskName")==null?"":map.get("taskName")));
             itemMap.add(String.valueOf(map.get("userName")==null?"":map.get("userName")));
+            itemMap.add(String.valueOf(map.get("planNum")==null?"":map.get("planNum")));
+            itemMap.add(String.valueOf(map.get("productName")==null?"":map.get("productName")));
+            itemMap.add(String.valueOf(map.get("startDate")==null?"":map.get("startDate")));
+            itemMap.add(String.valueOf(map.get("endDate")==null?"":map.get("endDate")));
+            itemMap.add(String.valueOf(map.get("statinoName")==null?"":map.get("statinoName")));
             itemMap.add(String.valueOf(map.get("planWorkTime")==null?"":map.get("planWorkTime")+"分钟 "+map.get("planCost")+"元"));
             itemMap.add(String.valueOf(map.get("nowWorkTime")==null?"":map.get("nowWorkTime")+"分钟 "+map.get("nowCost")+"元"));
             itemMap.add(String.valueOf(map.get("progress")==null?0:map.get("progress")));