diff --git a/src/cn/com/ebewin/ysr/dialog/systemdatadistribution/SystemDataDistributionDialog.java b/src/cn/com/ebewin/ysr/dialog/systemdatadistribution/SystemDataDistributionDialog.java index 7217791..7e73440 100644 --- a/src/cn/com/ebewin/ysr/dialog/systemdatadistribution/SystemDataDistributionDialog.java +++ b/src/cn/com/ebewin/ysr/dialog/systemdatadistribution/SystemDataDistributionDialog.java @@ -1054,6 +1054,7 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen }else { System.out.println("当前版本对象未发布流程!获取姜科审批时间失败!"); + ss[6] = ""; } System.out.println("项目风险评估单查询···"); @@ -1079,6 +1080,7 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen }else { System.out.println("项目风险评估单-未查询到任何信息!"); + ss[7] = ""; } incremeFZOFM(jkJHTime,jkSJTime,"风险评估"); } @@ -1101,9 +1103,6 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen } if (sjbrw != null && sjbrw.length>0) { bztjhTime = sjbrw[0].getProperty("finish_date"); -// if (bztjhTime != null && !bztjhTime.isEmpty()){ -// this.bzt_total_fm ++; -// } ss[8] = bztjhTime == null ? "" : bztjhTime; } //查询“布置图”的实际:单元格索引-9 @@ -1819,7 +1818,9 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen entryNamesCGD2.add("类型"); entryValuesCGD2.add(extractAndFormatNumber(projectCodeString)+"-S*"); entryValuesCGD2.add("A"); - entryValuesCGD2.add("Ysr8_SystemPRevision"); +// entryValuesCGD2.add("Ysr8_SystemPRevision"); + //调整20250605:采购单实际时间的类型改成Ysr8_ProjectDocRevision + entryValuesCGD2.add("Ysr8_ProjectDocRevision"); if (sjTime1 != null){ entryNamesCGD2.add("发布时间大于"); entryValuesCGD2.add(sjTime1); @@ -1905,6 +1906,8 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen ss[41] = jsxy == null ? "" : jsxy; }else { System.out.println("调用项目文档查询 未查询到 技术协议 的信息!"); + //按照没有实际时间处理:分母+1 + incremeFZOFMForOnlySJ(null,"技术协议"); } //--------------------------------------------------------------------------------------------------------------------------------- System.out.println("预验收报告查询···"); @@ -1932,6 +1935,7 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen ss[42] = yysbg == null ? "" : yysbg; }else { System.out.println("调用项目文档查询 未查询到 预验收报告 的信息!"); + incremeFZOFMForOnlySJ(null,"预验收报告"); } //---------------------------------------------------------------------------------------------------------------------------------- System.out.println("终验收单查询···"); @@ -1959,6 +1963,7 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen ss[43] = zysd == null ? "" : zysd; }else { System.out.println("调用项目文档查询 未查询到 终验收单 的信息!"); + incremeFZOFMForOnlySJ(null,"终验收单"); } //---------------------------------------------------------------------------------------------------------------------------------- System.out.println("项目启动通知查询···"); @@ -1986,6 +1991,7 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen ss[44] = xmqdtz == null ? "" : xmqdtz; }else { System.out.println("调用项目文档查询 未查询到 项目启动通知 的信息!"); + incremeFZOFMForOnlySJ(null,"项目启动通知"); } //---------------------------------------------------------------------------------------------------------------------------------- System.out.println("项目进度计划任务查询···"); @@ -2015,6 +2021,7 @@ public class SystemDataDistributionDialog extends JFrame implements ActionListen ss[45] = xmjdjh == null ? "" : xmjdjh; }else { System.out.println("调用时间表任务查询 未查询到 项目进度计划任务 的信息!"); + incremeFZOFMForOnlySJ(null,"项目进度计划任务"); } //---------------------------------------------------------------------------------------------------------------------------------- System.out.println("虚拟调试完成时间查询···");