diff --git a/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java b/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java index e865be3..9d411c2 100644 --- a/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java +++ b/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java @@ -54,14 +54,17 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen for (DynamicObject dataEntity : dataEntities) { String dynamicObjectType = dataEntity.getDynamicObjectType().getName(); Date currentDate = new Date();//当前日期 - int remainingDays = 0; + int remainingDays = 2147483647; if (StringUtils.equals(dynamicObjectType, "bd_supplier")) { + //单据头 证照剩余最小有效天数 初始化 + dataEntity.set("tqq9_minvaliddays", remainingDays); //医疗器械生生产许可证 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");//失效日期 @@ -160,9 +163,13 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { dataEntity.set("tqq9_minvaliddays", remainingDays); - } } + //所有日期都为空,则将 证照剩余最小有效天数 置空 + if (tqq9_datefield1 == null && tqq9_datefield21 == null && tqq9_datefield4 == null && tqq9_datefield22 == null && tqq9_licenseenddate == null && + tqq9_zlbzxyyxqz == null && tqq9_datefield2 == null && tqq9_datefield7 == null && tqq9_datefield9 == null && tqq9_gspyxqz == null) { + dataEntity.set("tqq9_minvaliddays", null); + } } else if (StringUtils.equals(dynamicObjectType, "tqq9_registration")) { //商品注册证 Date tqq9_enddate = dataEntity.getDate("tqq9_enddate");//失效日期