From f5253f62005d961b273c5136224082a8bf484250 Mon Sep 17 00:00:00 2001 From: xiongcz Date: Thu, 5 Jun 2025 11:24:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(dialog):=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=86=E5=B8=83=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91-=20=E4=B8=BA=E6=9C=AA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=B0=E4=BF=A1=E6=81=AF=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=20-=20=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E5=AE=9E=E9=99=85=E6=97=B6=E9=97=B4=E7=9A=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=20Ysr8=5FProjectDocRevision=20-=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E6=9C=AA=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=88=86=E6=AF=8D+1?= =?UTF-8?q?=E5=A4=84=E7=90=86=20-=20=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemDataDistributionDialog.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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("虚拟调试完成时间查询···");