From e954adac8f9682eabc90960262cc0f27d44f937a Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 18:18:51 +0800
Subject: [PATCH] update

---
 .../src/main/resources/mainOrm/master/FolviteMapper.xml                | 2 +-
 .../src/main/resources/mainOrm/master/FolviteReceiveMapper.xml         | 2 +-
 .../com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
index 13f4c15..45bf5f7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -131,7 +131,7 @@
             resultType="map">
         SELECT
         f.`name`,f.card_no,f.phone,p.receive_date,p.receive_number,p.receive_week,p.highrisk,p.provide_unit,f.habitation_address,f.habitation_area,f.habitation_city,
-        f.habitation_country,f.habitation_province,p.`issuer`,p.id as id, f.id as folviteId
+        f.habitation_country,f.habitation_province,p.`issuer`,p.id as id, f.id as folviteId,f.certificate_type
         FROM
         lyms_folvite_provide AS p
         LEFT JOIN
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index 904da2b..ac67ff3 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -62,7 +62,7 @@ yn
         SELECT
         f.`name` as name,f.birthday,f.card_no,f.vc_card,f.isconceive,f.receivesum,
         SUM(p.receive_number) as sumNumber,f.drawTime,f.domicile_address,f.domicile_area,
-        f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer,f.phone
+        f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer,f.phone,f.certificate_type
         FROM
         lyms_folvite_provide AS p
         LEFT JOIN
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
index f0669f8..c6adfc1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
@@ -358,6 +358,7 @@ public class FolviteServiceImpl implements FolviteService {
             m.put("issuer", map.get("issuer"));
             m.put("issuerName", usersService.getUsers(Integer.valueOf(map.get("issuer").toString())).getName());
             m.put("phone", map.get("phone"));
+            m.put("certificateType", map.get("certificate_type"));
             datas.add(m);
         }
         return datas;
@@ -394,7 +395,7 @@ public class FolviteServiceImpl implements FolviteService {
                     (String) map.get("habitation_area"), (String) map.get("habitation_country"), (String) map.get("habitation_address"), basicConfigService));
             m.put("id", map.get("id"));
             m.put("folviteId", map.get("folviteId"));
-
+            m.put("certificateType", map.get("certificate_type"));
             data.add(m);
         }
         return data;
-- 
1.8.3.1