TimeType控制字段添加 无考勤无法填报

日报导出修改 企业微信同步
任务模板添加操作日志
八爪鱼TimeType控制字段添加

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

@@ -3178,8 +3178,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<Map<String, Object>> worktimeList = userMonthWork.worktimeList;
             //dataItem.add(userMonthWork.name+(worktimeList.size()==0?"(未填)":""));
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                dataItem.add("$userName="+userMonthWork.corpwxUserId+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
-                dataItem.add("$departmentName="+userMonthWork.corpwxDeptId+"$");
+                dataItem.add("$userName="+(userMonthWork.corpwxUserId==null?"":userMonthWork.corpwxUserId)+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
+                dataItem.add("$departmentName="+(userMonthWork.corpwxDeptId==null?"":userMonthWork.corpwxDeptId)+"$");
             }else {
                 dataItem.add(userMonthWork.name+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
                 dataItem.add(userMonthWork.departmentName);
@@ -4705,7 +4705,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             object.put("PSPHI",rl.get("projectCode"));
             object.put("GJAHR",rl.get("ofyear"));
             object.put("MONAT",rl.get("ofmonth"));
-            object.put("PROJK",rl.get("taskGroupCode"));
+            object.put("PROJK",rl.get("wbsCode"));
             object.put("DMBTR",rl.get("cost"));
             object.put("ZID",rl.get("jobNumber"));
             object.put("ZUNAM",rl.get("userName"));

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

@@ -552,7 +552,7 @@
     </select>
 
     <select id="getUploadThirdReportData" resultType="java.util.Map">
-        select IFNULL(p.project_code,'其他') as projectCode,IFNULL(tg.task_group_code,'其他')as taskGroupCode,DATE_FORMAT(r.create_date, '%Y') as ofyear,
+        select IFNULL(p.project_code,'其他') as projectCode,IFNULL(tg.wbs_code,'其他')as wbsCode,DATE_FORMAT(r.create_date, '%Y') as ofyear,
         DATE_FORMAT(r.create_date, '%m') as ofmonth,u.name as userName,u.job_number as jobNumber,d.department_name as departmentName,SUM(r.cost) as cost
         from report r
         left join project p  on p.id=r.project_id