jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit e954adac8f9682eabc90960262cc0f27d44f937a

Authored by Administrator
1 parent bdc7366ee1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 4 additions and 3 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml View file @ e954ada
... ... @@ -131,7 +131,7 @@
131 131 resultType="map">
132 132 SELECT
133 133 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,
134   - f.habitation_country,f.habitation_province,p.`issuer`,p.id as id, f.id as folviteId
  134 + f.habitation_country,f.habitation_province,p.`issuer`,p.id as id, f.id as folviteId,f.certificate_type
135 135 FROM
136 136 lyms_folvite_provide AS p
137 137 LEFT JOIN
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ e954ada
... ... @@ -62,7 +62,7 @@
62 62 SELECT
63 63 f.`name` as name,f.birthday,f.card_no,f.vc_card,f.isconceive,f.receivesum,
64 64 SUM(p.receive_number) as sumNumber,f.drawTime,f.domicile_address,f.domicile_area,
65   - f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer,f.phone
  65 + f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer,f.phone,f.certificate_type
66 66 FROM
67 67 lyms_folvite_provide AS p
68 68 LEFT JOIN
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java View file @ e954ada
... ... @@ -358,6 +358,7 @@
358 358 m.put("issuer", map.get("issuer"));
359 359 m.put("issuerName", usersService.getUsers(Integer.valueOf(map.get("issuer").toString())).getName());
360 360 m.put("phone", map.get("phone"));
  361 + m.put("certificateType", map.get("certificate_type"));
361 362 datas.add(m);
362 363 }
363 364 return datas;
... ... @@ -394,7 +395,7 @@
394 395 (String) map.get("habitation_area"), (String) map.get("habitation_country"), (String) map.get("habitation_address"), basicConfigService));
395 396 m.put("id", map.get("id"));
396 397 m.put("folviteId", map.get("folviteId"));
397   -
  398 + m.put("certificateType", map.get("certificate_type"));
398 399 data.add(m);
399 400 }
400 401 return data;