From 7202a8edf0c4b4d22790037e72c412c8544f1b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=9A=E8=B1=86=E8=B1=86?= <13356128+sunandmoon60@user.noreply.gitee.com> Date: Tue, 5 Aug 2025 18:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E6=9C=89=E6=95=88=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/sys/ValiddaysSavePlugin.java | 49 ++++++++++++++++- .../cloud/app/plugin/task/DaysRemaining.java | 54 ++++++++++++++++++- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java b/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java index d17510f..19a4f24 100644 --- a/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java +++ b/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java @@ -46,6 +46,7 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen e.getFieldKeys().add("tqq9_validdays_gsp"); e.getFieldKeys().add("tqq9_enddate"); e.getFieldKeys().add("tqq9_validdays"); + e.getFieldKeys().add("tqq9_minvaliddays"); } @Override @@ -55,25 +56,36 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen for (DynamicObject dataEntity : dataEntities) { String dynamicObjectType = dataEntity.getDynamicObjectType().getName(); Date currentDate = new Date();//当前日期 - long remainingDays = 0; + Long remainingDays = null; if (StringUtils.equals(dynamicObjectType, "bd_supplier")) { //医疗器械生生产许可证 Date tqq9_datefield1 = dataEntity.getDate("tqq9_datefield1");//失效日期 if (tqq9_datefield1 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield1, currentDate); dataEntity.set("tqq9_validdays_ylqxsc", remainingDays); + dataEntity.set("tqq9_minvaliddays", remainingDays); } //医疗器械经营许可证 Date tqq9_datefield21 = dataEntity.getDate("tqq9_datefield21");//失效日期 if (tqq9_datefield21 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield21, currentDate); dataEntity.set("tqq9_validdays_ylqxjy", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //第二类医疗器械经营备案凭证 Date tqq9_datefield4 = dataEntity.getDate("tqq9_datefield4");//失效日期 if (tqq9_datefield4 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield4, currentDate); dataEntity.set("tqq9_validdays_ylqxjy2", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //医疗机构执行许可证 @@ -81,42 +93,77 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen if (tqq9_datefield22 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield22, currentDate); dataEntity.set("tqq9_validdays_yljg", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //化妆品许可证 Date tqq9_licenseenddate = dataEntity.getDate("tqq9_licenseenddate");//失效日期 if (tqq9_licenseenddate != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate); dataEntity.set("tqq9_validdays_hzp", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //质量保证书 Date tqq9_zlbzxyyxqz = dataEntity.getDate("tqq9_zlbzxyyxqz");//失效日期 if (tqq9_zlbzxyyxqz != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_zlbzxyyxqz, currentDate); dataEntity.set("tqq9_validdays_zlbz", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //GMP证书 Date tqq9_datefield2 = dataEntity.getDate("tqq9_datefield2");//失效日期 if (tqq9_datefield2 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield2, currentDate); dataEntity.set("tqq9_validdays_gmp", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //法人委托授权书 Date tqq9_datefield7 = dataEntity.getDate("tqq9_datefield7");//失效日期 if (tqq9_datefield7 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield7, currentDate); dataEntity.set("tqq9_validdays_frsq", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //营业执照 Date tqq9_datefield9 = dataEntity.getDate("tqq9_datefield9");//失效日期 if (tqq9_datefield9 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield9, currentDate); dataEntity.set("tqq9_validdays_yyzz", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } //GSP证书 Date tqq9_gspyxqz = dataEntity.getDate("tqq9_gspyxqz");//失效日期 if (tqq9_gspyxqz != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_gspyxqz, currentDate); dataEntity.set("tqq9_validdays_gsp", remainingDays); + Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + dataEntity.set("tqq9_minvaliddays", remainingDays); + + } } } else if (StringUtils.equals(dynamicObjectType, "tqq9_registration")) { //商品注册证 diff --git a/lc123/cloud/app/plugin/task/DaysRemaining.java b/lc123/cloud/app/plugin/task/DaysRemaining.java index c20ef68..9a38657 100644 --- a/lc123/cloud/app/plugin/task/DaysRemaining.java +++ b/lc123/cloud/app/plugin/task/DaysRemaining.java @@ -27,27 +27,42 @@ public class DaysRemaining extends AbstractTask implements Plugin { DynamicObject[] suppliers = BusinessDataServiceHelper.load("bd_supplier", "" + "id,number,name,tqq9_datefield1,tqq9_validdays_ylqxsc,tqq9_datefield21,tqq9_validdays_ylqxjy,tqq9_datefield4,tqq9_validdays_ylqxjy2,tqq9_datefield22," + "tqq9_validdays_yljg,tqq9_licenseenddate,tqq9_validdays_hzp,tqq9_zlbzxyyxqz,tqq9_validdays_zlbz,tqq9_datefield2,tqq9_validdays_gmp,tqq9_datefield7," + - "tqq9_validdays_frsq,tqq9_datefield9,tqq9_validdays_yyzz,tqq9_gspyxqz,tqq9_validdays_gsp", null); + "tqq9_validdays_frsq,tqq9_datefield9,tqq9_validdays_yyzz,tqq9_gspyxqz,tqq9_validdays_gsp,tqq9_minvaliddays", null); Date currentDate = new Date();//当前日期 - long remainingDays = 0; + Long remainingDays = null; for (DynamicObject supplier : suppliers) { //医疗器械生生产许可证 Date tqq9_datefield1 = supplier.getDate("tqq9_datefield1");//失效日期 if (tqq9_datefield1 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield1, currentDate); supplier.set("tqq9_validdays_ylqxsc", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //医疗器械经营许可证 Date tqq9_datefield21 = supplier.getDate("tqq9_datefield21");//失效日期 if (tqq9_datefield21 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield21, currentDate); supplier.set("tqq9_validdays_ylqxjy", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //第二类医疗器械经营备案凭证 Date tqq9_datefield4 = supplier.getDate("tqq9_datefield4");//失效日期 if (tqq9_datefield4 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield4, currentDate); supplier.set("tqq9_validdays_ylqxjy2", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //医疗机构执行许可证 @@ -55,42 +70,77 @@ public class DaysRemaining extends AbstractTask implements Plugin { if (tqq9_datefield22 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield22, currentDate); supplier.set("tqq9_validdays_yljg", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //化妆品许可证 Date tqq9_licenseenddate = supplier.getDate("tqq9_licenseenddate");//失效日期 if (tqq9_licenseenddate != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate); supplier.set("tqq9_validdays_hzp", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //质量保证书 Date tqq9_zlbzxyyxqz = supplier.getDate("tqq9_zlbzxyyxqz");//失效日期 if (tqq9_zlbzxyyxqz != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_zlbzxyyxqz, currentDate); supplier.set("tqq9_validdays_zlbz", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //GMP证书 Date tqq9_datefield2 = supplier.getDate("tqq9_datefield2");//失效日期 if (tqq9_datefield2 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield2, currentDate); supplier.set("tqq9_validdays_gmp", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //法人委托授权书 Date tqq9_datefield7 = supplier.getDate("tqq9_datefield7");//失效日期 if (tqq9_datefield7 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield7, currentDate); supplier.set("tqq9_validdays_frsq", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //营业执照 Date tqq9_datefield9 = supplier.getDate("tqq9_datefield9");//失效日期 if (tqq9_datefield9 != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_datefield9, currentDate); supplier.set("tqq9_validdays_yyzz", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } } //GSP证书 Date tqq9_gspyxqz = supplier.getDate("tqq9_gspyxqz");//失效日期 if (tqq9_gspyxqz != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_gspyxqz, currentDate); supplier.set("tqq9_validdays_gsp", remainingDays); + Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); + if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { + supplier.set("tqq9_minvaliddays", remainingDays); + + } }