From ab2cd229d181b2f5ce67ae8322a5ab75190caf62 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Tue, 28 Mar 2023 16:34:30 +0800
Subject: [PATCH] =?UTF-8?q?67132=20=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=EF=BC=8C=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E3=80=82=E3=80=8166907=20=E6=B3=95=E8=A7=84=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/warn/service/LawsWarnService.java   | 9 +++++++++
 .../java/com/jero/modules/wkflow/enums/FlowTypeEnum.java | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
index de4f64d82..a00dc52ee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
@@ -93,6 +93,15 @@ public class LawsWarnService {
     private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService;
 
     public IPage getInfoPage(Map<String, Object> parameter) {
+        //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
+        String flag = String.valueOf(parameter.get("flag"));
+        if(StringUtils.equals(flag,"0")){
+            parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
+        } else if(StringUtils.equals(flag,"1")){
+            parameter.put("implement_time",parameter.get("WarnTime"));
+        }
+        parameter.remove("WarnTime");
+
         String cut = (String) parameter.get("cut");//中英文切换标识
         List<OnlCgformField> onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //查询的字段
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
index 8a0c19dfc..3e03084eb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
@@ -15,7 +15,7 @@ public enum FlowTypeEnum {
     YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"),
     FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"),
     FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"),
-    QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单确认","Regulation list confirmation"),
+    QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"),
     CERTIFICATION_LC("21","认证流程","CERTIFICATION_LC","认证流程","certification_lc","Pre-Homo流程","Pre-Homo flow"),
     ;