增加身份证

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserData.java

@@ -51,6 +51,12 @@ public class UserData implements Serializable, Cloneable {
     @ApiModelProperty(value = "手机号码", example = "")
     private String phone;
 
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "证件号", example = "")
+    private String idCard;
+
     /**
      * 城市名称
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -437,6 +437,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 userData.setCityName(showBaseVoDtoList.get(0).getCity());
                 userData.setType(showBaseVoDtoList.get(0).getType());
                 userData.setPhone(showBaseVoList.get(0).getPhone());
+                userData.setIdCard(showBaseVoList.get(0).getIdCard());
                 userData.setState(showBaseVoDtoList.get(0).getState());
                 if (userData.getType() != 2) {
                     userData.setAgentName(showBaseVoDtoList.get(0).getName());
@@ -476,6 +477,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userData.setCityName(smileUser.getCity());
                         userData.setType(smileUser.getType());
                         userData.setPhone(smileUser.getPhone());
+                        userData.setIdCard(smileUser.getIdCard());
                         userData.setState(smileUser.getState());
                         //判断用户是否为总代
                         if (userData.getType() == 1) {
@@ -645,6 +647,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "姓名"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "所属地区"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "身份"));
+        headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "证件号"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "手机号"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "总代姓名"));
 
@@ -680,6 +683,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             } else {
                 arrayList.add("未知");
             }
+            arrayList.add(userData.getIdCard());
             arrayList.add(userData.getPhone());
             arrayList.add(userData.getAgentName());
             //便利票数据

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/ShowBaseVoDto.java

@@ -26,6 +26,8 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private String phone;
 
+    private String idCard;
+
     /**
      * agentId
      */

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -77,6 +77,7 @@
             sukotr.city,
             sukotr.uid AS agent_id,
             sukotr.ticket_id AS tid,
+            sukotr.id_card as idCard
             sukotr.type,
             sukotr.phone,
             sukotr.state,
@@ -96,6 +97,7 @@
                     su.type,
                     su.phone,
                     su.state,
+                    su.id_card,
                     agentSu.name agentName,
                     kotr.order_id,
                     kotr.performance_id,

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -179,6 +179,7 @@
                su.city,
                su.phone,
                su.agent_id,
+               su.id_card,
                su.state
         FROM smile_user AS su
                  INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master