From 464126f3d9c66f0b34b00431227113de26d92e98 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 2 Jul 2022 22:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E7=94=9F=E5=B7=A5=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/LivelihoodProjectsFacade.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java index 874c251..a856975 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -46,6 +47,7 @@ import java.util.*; public class LivelihoodProjectsFacade { private Logger logger = LoggerFactory.getLogger(LivelihoodProjectsFacade.class); + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); @Autowired private ResidentsArchiveService residentsArchiveService; @Autowired @@ -791,6 +793,21 @@ public class LivelihoodProjectsFacade { continue; } + if ("4".equals(HIS_VERSION)) + { + if (!("2".equals(patients.getCityId()) || (patients.isSendCoupon() != null && patients.isSendCoupon()))) + { + continue; + } + }else if ("16".equals(HIS_VERSION)) + { + if (patients.getBookbuildingDate() != null && patients.getFmDate() != null && DateUtil.daysBetween(patients.getBookbuildingDate(),patients.getFmDate()) <= 30) + { + continue; + } + } + + Map map = new HashMap<>(); //id map.put("id",StringUtils.isNotEmpty(patients.getId())?patients.getId():"/"); -- 1.8.3.1