From ed353fcbbcd0a40f2c70c9888b65d4232cea45b4 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 15 Nov 2022 16:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcResiComparisonRecordServiceImpl.java    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
index fdb31f71a9..792774849f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
@@ -115,11 +115,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
                 resultDTO.setResultExplain("公安部接口调用失败");
                 return resultDTO;
             } else {
-                //数据已处理
-                recordEntity.setType("1");
                 //公安部不存在的数据
                 if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) {
                     recordEntity.setComparisonResult("公安部身份证号对应数据不存在");
+                    //数据不一致的赋值为未处理信息不一致(空)
+                    recordEntity.setType("0");
                     //代表程序干活了
                     recordEntity.setIdentical("2");
                     resultDTO.setResult(true);
@@ -129,11 +129,14 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
                     recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM());
                     //公安部跟居民库姓名不一致
                     if (!entity.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) {
+                        //姓名不一致的赋值为未处理信息不一致(否)
+                        recordEntity.setType("0");
                         recordEntity.setIdentical("0");
                         recordEntity.setComparisonResult("公安部与居民库姓名不相同");
                         resultDTO.setResult(true);
                         resultDTO.setResultExplain("公安部与居民库姓名不相同");
                     } else {
+                        recordEntity.setType("1");
                         recordEntity.setIdentical("1");
                     }
                 }
@@ -180,11 +183,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
                 if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) {
                     recordEntity.setComparisonResult("接口调用失败");
                 } else {
-                    //数据已处理
-                    recordEntity.setType("1");
                     //公安部不存在的数据
                     if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) {
                         recordEntity.setComparisonResult("公安部身份证号对应数据不存在");
+                        //数据不一致的赋值为未处理信息不一致(空)
+                        recordEntity.setType("0");
                         //代表程序干活了
                         recordEntity.setIdentical("2");
                     } else {//在公安部查询到了数据
@@ -192,9 +195,12 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
                         recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM());
                         //公安部跟居民库姓名不一致
                         if (!o.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) {
+                            //姓名不一致的赋值为未处理信息不一致(否)
+                            recordEntity.setType("0");
                             recordEntity.setIdentical("0");
                             recordEntity.setComparisonResult("公安部与居民库姓名不相同");
                         } else {
+                            recordEntity.setType("1");
                             recordEntity.setIdentical("1");
                         }
                     }
@@ -288,11 +294,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
                 if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) {
                     o.setComparisonResult("接口调用失败");
                 } else {
-                    //数据已处理
-                    o.setType("1");
                     //公安部不存在的数据
                     if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) {
                         o.setComparisonResult("公安部身份证号对应数据不存在");
+                        //数据不一致的赋值为未处理信息不一致(空)
+                        o.setType("0");
                         //代表程序干活了
                         o.setIdentical("2");
                     } else {//在公安部查询到了数据
@@ -300,9 +306,12 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
                         o.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM());
                         //公安部跟居民库姓名不一致
                         if (!o.getResiName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) {
+                            //姓名不一致的赋值为未处理信息不一致(否)
+                            o.setType("0");
                             o.setIdentical("0");
                             o.setComparisonResult("公安部与居民库姓名不相同");
                         } else {
+                            o.setType("1");
                             o.setIdentical("1");
                         }
                     }