yangys
2025-09-09 fc3ae614a4c5a2a7cdb9029ecfc4372eb1c28b18
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
@@ -93,7 +93,7 @@
      dataMap.put("startTime",dispatchDateStr);//工段负责人/单元负责人派出时间
      dataMap.put("fuzeren",approveInfo.getProgrammerName());//负责人
      int isProgram = 0;
      if(StringUtils.equals(props.getHasCuredProgram(),FlowContants.Y)){
         //校对任务
         dataMap.put("jd", WordReplaceUtil.CHECKED);
@@ -109,31 +109,24 @@
      dataMap.put("fzy",WordReplaceUtil.CHECKED); //仿真 是
      dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//仿真 否
      Date programDate = approveInfo.getCheckDate();
      Date checkDate = approveInfo.getCheckDate();
      String checkDateStr = " ";
      if (checkDate != null) {
         checkDateStr = DateUtil.format(programDate, DATE_PATTERN);
      }
      String approveDateStr = " ";
      if (approveInfo.getApproveDate() != null) {
         approveDateStr = DateUtil.format(approveInfo.getApproveDate(), DATE_PATTERN);
      }
      String bianzhi = userCommonService.getUserNameById(dispatch.getCreateUser());
      String bianzhiDateStr =  DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
      dataMap.put("bianzhi",bianzhi+"/"+bianzhiDateStr);//编制:计划员/发起时间
      dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/时间不确定");
      dataMap.put("shenpi",approveInfo.getSeniorName()+"/时间不确定");
      dataMap.put("bianzhi",bianzhi+"/"+formatTimeForTable(dispatch.getCreateTime()));//编制:计划员/发起时间
      dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/"+formatTimeForTable(approveInfo.getDispatchDate())); //
      dataMap.put("shenpi",approveInfo.getSeniorName()+"/"+formatTimeForTable(approveInfo.getApproveDate()));//就是高师审批时间
      dataMap.put("sendPath",machine.getProgSendDir()!=null?machine.getProgSendDir():"");
      return dataMap;
   }
   String formatTimeForTable(Date date){
      String DATE_PATTERN = "yyyy-M-d";
      if(date==null){
         return "";
      }
      return DateUtil.format(date, DATE_PATTERN);
   }
   /*
   public void exportApproveTableOld(String processInstanceId, OutputStream os) throws DocumentException, IOException {