From 0c13abc34e2de034e8d20369f7a37b12046f33a5 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 4 Jun 2024 19:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8F=8C=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zdxt/code/domain/Zfryjdm2405301.java  | 61 +++++++++++++++++++
 .../code/mapper/Xzjcjbxx025711Mapper.java     | 15 +++++
 .../service/impl/ThirdLoginServiceImpl.java   |  7 ++-
 .../resources/mapper/Xzjcjbxx025711Mapper.xml |  8 +++
 4 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
new file mode 100644
index 00000000..37409ce6
--- /dev/null
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
@@ -0,0 +1,61 @@
+package com.zdxt.code.domain;
+
+/**
+ * 执法人员数据
+ */
+public class Zfryjdm2405301 {
+
+    /**
+     * 执法人员姓名
+     */
+    private String name;
+
+    /**
+     * 执法单位
+     */
+    private String zfzzfdw;
+
+    /**
+     * 身份证号码
+     */
+    private String sfzcode;
+
+    /**
+     * 执法证编号
+     */
+    private String zfcode;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getZfzzfdw() {
+        return zfzzfdw;
+    }
+
+    public void setZfzzfdw(String zfzzfdw) {
+        this.zfzzfdw = zfzzfdw;
+    }
+
+    public String getSfzcode() {
+        return sfzcode;
+    }
+
+    public void setSfzcode(String sfzcode) {
+        this.sfzcode = sfzcode;
+    }
+
+    public String getZfcode() {
+        return zfcode;
+    }
+
+    public void setZfcode(String zfcode) {
+        this.zfcode = zfcode;
+    }
+
+
+}
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java
index 30b0112d..b318d82c 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java
@@ -3,6 +3,7 @@ package com.zdxt.code.mapper;
 import com.zdxt.code.domain.Xzjcjbxx025711;
 import com.zdxt.code.domain.Xzcfajjbxx026705;
 import com.zdxt.code.domain.Xzqzjbxx173774;
+import com.zdxt.code.domain.Zfryjdm2405301;
 
 import java.util.List;
 
@@ -66,4 +67,18 @@ public interface Xzjcjbxx025711Mapper
      * @return
      */
     public List<Xzcfajjbxx026705> queryCFAJByEnterpriseNumber(String enterpriseNumber);
+
+    /**
+     * 查询行政处罚案件
+     * @param
+     * @return 查询所有执法人员数据
+     */
+    public List<Zfryjdm2405301> queryZFRY();
+
+    /**
+     * 通过身份证查询是否为执法人员
+     * @return
+     */
+    public List<Zfryjdm2405301> queryZFRYByIdCard(String userIdCard);
+
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
index fb17777e..598e9810 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zdxt.code.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zdxt.auth.dto.DeptBean;
@@ -163,8 +164,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //结束时间 返回为空表示为永久
             String termEnd = jsonObject.getString("termEnd");
             try {
-                Date termEndD = format.parse(termEnd);
-                termEnd = format.format(termEndD);
+               if(StrUtil.isNotEmpty(termEnd)){
+                   Date termEndD = format.parse(termEnd);
+                   termEnd = format.format(termEndD);
+               }
             } catch (Exception e) {
                 termEnd = "永久";
             }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml
index 58d55c0f..65d82230 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml
@@ -316,5 +316,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN XZCFAJDSRXX594019 c  on a.c201000 = c.c201000
             where c.c201016 = #{enterpriseNumber} order by  c.c201016 desc limit 10
     </select>
+
+    <select id="queryZFRY" parameterType="String" resultType="com.zdxt.code.domain.Zfryjdm2405301">
+            select `name`,zfzzfdw,sfzcode,zfcode  from ZFRYJDM2405301
+    </select>
+
+    <select id="queryZFRYByIdCard" parameterType="String" resultType="com.zdxt.code.domain.Zfryjdm2405301">
+            select `name`,zfzzfdw,sfzcode,zfcode from ZFRYJDM2405301 where SFZCODE = #{userIdCard}
+    </select>
     
 </mapper>
\ No newline at end of file