添加同步预约和注册用户类

db/module.sql

@@ -235,7 +235,9 @@ CREATE TABLE mortals_xhx_person(
     `phone` varchar(20)      COMMENT '手机号码',
     `birthday` datetime NOT NULL     COMMENT '出生日期',
     `address` varchar(256) NOT NULL     COMMENT '家庭住址',
-    `photo` varchar(256) NOT NULL     COMMENT '照片路径',
+    `photo` varchar(128) NOT NULL     COMMENT '本地照片路径',
+    `sourcePhotoUri` varchar(128)      COMMENT '原始照片路径',
+    `sourceId` bigint(20)      COMMENT 'Php原始注册用户id',
     `remark` varchar(256)      COMMENT '备注',
     `source` tinyint(2)      COMMENT '注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)',
     `inFaceHk` tinyint(2) NOT NULL   DEFAULT '0'  COMMENT '是否添加到海康人脸库(0.否，1.是)',
@@ -247,6 +249,7 @@ CREATE TABLE mortals_xhx_person(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='注册人员';
+
 -- ----------------------------
 -- 设备业务表
 -- ----------------------------
@@ -405,3 +408,28 @@ CREATE TABLE mortals_xhx_face_plan(
     `updateUserId` bigint(20)      COMMENT '更新人ID',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='人员识别计划信息';
+
+
+-- ----------------------------
+-- 预约人员表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_appointment_person`;
+CREATE TABLE mortals_xhx_appointment_person(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `siteId` bigint(20)      COMMENT '站点Id',
+    `siteName` varchar(256)      COMMENT '站点名称',
+    `personId` bigint(20) NOT NULL     COMMENT '人员id',
+    `name` varchar(50)      COMMENT '姓名',
+    `contactInfo` varchar(50)      COMMENT '联系方式',
+    `idCard` varchar(50)      COMMENT '身份证号码',
+    `bussinessId` bigint(20)      COMMENT '业务Id',
+    `bussinessName` varchar(255)      COMMENT '预约业务',
+    `appontmentNumber` varchar(50)      COMMENT '预约编号',
+    `appointmentStartTime` datetime      COMMENT '预约开始时间',
+    `appointmentEndTime` datetime      COMMENT '预约结束时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `createTime` datetime      COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='预约人员';

refined-manager/pom.xml

@@ -31,6 +31,7 @@
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 				<profiles.log.level>info</profiles.log.level>
 				<profiles.publish.path>/home/publish</profiles.publish.path>
+				<profiles.php.host>http://192.168.0.98:8090</profiles.php.host>
 				<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
 				<profiles.sms.apiId>k6BVS1PEbyzcJAE4</profiles.sms.apiId>
 				<profiles.sms.type>3</profiles.sms.type>
@@ -55,10 +56,10 @@
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.log.level>INFO</profiles.log.level>
+				<profiles.php.host>http://192.168.0.98:8090</profiles.php.host>
 				<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
 				<profiles.sms.apiId>k6BVS1PEbyzcJAE4</profiles.sms.apiId>
 				<profiles.sms.type>3</profiles.sms.type>
-
 				<profiles.hik.host>8.136.255.30:8001</profiles.hik.host>
 				<profiles.hik.appKey>25128371</profiles.hik.appKey>
 				<profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>

refined-manager/src/main/java/com/mortals/xhx/busiz/req/register/registerReq.java

+package com.mortals.xhx.busiz.req.register;
+
+
+import lombok.Data;
+
+@Data
+public class registerReq {
+
+    private Integer page;
+
+    private Integer size;
+
+}

refined-manager/src/main/java/com/mortals/xhx/busiz/rsp/register/AppointmentDataInfo.java

+package com.mortals.xhx.busiz.rsp.register;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppointmentDataInfo {
+
+    @JSONField(name = "per_page")
+    Integer perPage;
+
+    @JSONField(name = "total")
+    Integer total;
+
+    @JSONField(name = "data")
+    List<AppointmentDataItem> data;
+
+    @JSONField(name = "last_page")
+    Integer lastPage;
+
+    @JSONField(name = "current_page")
+    Integer currentPage;
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/rsp/register/AppointmentDataItem.java

+package com.mortals.xhx.busiz.rsp.register;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AppointmentDataItem {
+
+    @JSONField(name = "birthday")
+    private String birthday;
+
+    @JSONField(name = "business_name")
+    private String businessName;
+
+    @JSONField(name = "idcard_IDCardNo")
+    private String idcardIDCardNo;
+
+    @JSONField(name = "businessid")
+    private Long businessId;
+
+    @JSONField(name = "endtime",format = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @JSONField(name = "starttime",format = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @JSONField(name = "idcard_Name")
+    private String idcardName;
+
+    @JSONField(name = "number")
+    private String number;
+
+    @JSONField(name = "idcard_Sex")
+    private String idcardSex;
+
+    @JSONField(name = "idcard_Address")
+    private String idcardAddress;
+
+    @JSONField(name = "peopleid")
+    private Long peopleId;
+
+    @JSONField(name = "phone")
+    private String phone;
+
+    @JSONField(name = "siteid")
+    private Long siteId;
+
+    @JSONField(name = "idcardData_PhotoFileName")
+    private String idcardDataPhotoFileName;
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/rsp/register/DataItem.java

+package com.mortals.xhx.busiz.rsp.register;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class DataItem {
+
+    @JSONField(name = "birthday")
+    String birthday;
+
+    @JSONField(name = "idcard_Address")
+    String idcardAddress;
+
+    @JSONField(name = "idcard_Sex")
+    String idcardSex;
+
+    @JSONField(name = "phone")
+    String phone;
+
+    @JSONField(name = "idcard_IDCardNo")
+    String idcardIDCardNo;
+
+    @JSONField(name = "id")
+    Long id;
+
+    @JSONField(name = "idcard_Name")
+    String idcardName;
+
+    @JSONField(name = "idcardData_PhotoFileName")
+    String idcardDataPhotoFileName;
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/rsp/register/RegisterDataInfo.java

+package com.mortals.xhx.busiz.rsp.register;
+
+import java.util.List;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class RegisterDataInfo {
+
+    @JSONField(name = "per_page")
+    Integer perPage;
+
+    @JSONField(name = "total")
+    Integer total;
+
+    @JSONField(name = "data")
+    List<DataItem> data;
+
+    @JSONField(name = "last_page")
+    Integer lastPage;
+
+    @JSONField(name = "current_page")
+    Integer currentPage;
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 海康事件类型
+*
+* @author zxfei
+*/
+public enum HikEventTypeEnum {
+    重点人员识别事件("event_face_recognition", "重点人员识别事件");
+    private String value;
+    private String desc;
+
+    HikEventTypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static HikEventTypeEnum getByValue(String value) {
+        for (HikEventTypeEnum recognitionPlanTypeEnum : HikEventTypeEnum.values()) {
+            if (recognitionPlanTypeEnum.getValue() == value) {
+                return recognitionPlanTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (HikEventTypeEnum item : HikEventTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/common/key/ParamKey.java

@@ -15,6 +15,9 @@ public class ParamKey {
     /** 人脸识别阈值 */
     public static final String PARAM_FACE_THRESHOLD = "face_threshold";
 
+    /** 人脸相似度 */
+    public static final String PARAM_FACE_SIMILARITY = "face_similarity";
+
     /**
      * 系统参数：设备心跳间隔时间（单位：秒，默认值：60秒）
      */

refined-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SubEventStartedService.java

@@ -30,7 +30,6 @@ import com.mortals.xhx.module.hik.face.service.IHikPlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
@@ -39,7 +38,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 
-@Component
+//@Component
 @Slf4j
 public class SubEventStartedService implements IApplicationStartedService {
 

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.busiz.rsp.register.AppointmentDataInfo;
+import com.mortals.xhx.busiz.rsp.register.AppointmentDataItem;
+import com.mortals.xhx.busiz.rsp.register.DataItem;
+import com.mortals.xhx.busiz.rsp.register.RegisterDataInfo;
+import com.mortals.xhx.common.code.SourceEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonQuery;
+import com.mortals.xhx.module.appointment.service.AppointmentPersonService;
+import com.mortals.xhx.module.person.model.PersonEntity;
+import com.mortals.xhx.module.person.model.PersonQuery;
+import com.mortals.xhx.module.person.service.PersonService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 同步预约人数。
+ */
+@Slf4j
+@Service("SyncRegisterUserPicTask")
+public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private PersonService personService;
+    @Autowired
+    private AppointmentPersonService appointmentPersonService;
+
+
+    @Value("${php.host:''}")
+    private String host;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("同步今天预约用户任务");
+        syncAppointmentPerson();
+        log.info("同步今天预约用户任务完成");
+
+    }
+
+
+    private void syncAppointmentPerson() {
+        //根据数量查询
+        String registerPath = "/inter/Actuary/orderPeople";
+        String url = host + registerPath;
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("page", 1);
+        params.put("size", 1);
+        String respJson = HttpUtil.get(url, params);
+        Rest<AppointmentDataInfo> rest = JSON.parseObject(respJson, new TypeReference<Rest<AppointmentDataInfo>>() {
+        });
+
+        if (rest.getCode() == YesNoEnum.YES.getValue()) {
+            Integer total = rest.getData().getTotal();
+            if (total > 1) {
+                params = new HashMap<>();
+                params.put("page", 1);
+                params.put("size", total);
+                respJson = HttpUtil.get(url, params);
+                Rest<AppointmentDataInfo> restTotal = JSON.parseObject(respJson, new TypeReference<Rest<AppointmentDataInfo>>() {
+                });
+
+                if (restTotal.getCode() == YesNoEnum.YES.getValue()) {
+                    //同步今天预约用户
+                    List<AppointmentDataItem> appointUserList = restTotal.getData().getData();
+
+                    log.info("预约用户总数量：{}", appointUserList.size());
+                    if (!ObjectUtils.isEmpty(appointUserList)) {
+                        //查询今天添加的预约 并删除
+                        AppointmentPersonQuery appointmentPersonQuery = new AppointmentPersonQuery();
+                        appointmentPersonQuery.setCreateTimeStart(DateUtil.format(new Date(),"yyyy-MM-dd"));
+                        appointmentPersonQuery.setCreateTimeEnd(DateUtil.format(new Date(),"yyyy-MM-dd"));
+                        Long[] ids = appointmentPersonService.find(appointmentPersonQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
+                        if(!ObjectUtils.isEmpty(ids)){
+                            appointmentPersonService.remove(ids,null);
+                        }
+                        List<AppointmentPersonEntity> newUserList = appointUserList.stream().map(user -> {
+                            AppointmentPersonEntity appointmentPersonEntity = new AppointmentPersonEntity();
+                            appointmentPersonEntity.initAttrValue();
+                            PersonEntity personCache = personService.getExtCache(user.getIdcardIDCardNo());
+                            appointmentPersonEntity.setPersonId(personCache == null ? -1 : personCache.getId());
+                            appointmentPersonEntity.setName(personCache == null ? "" : personCache.getName());
+                            appointmentPersonEntity.setSiteId(user.getSiteId());
+                            appointmentPersonEntity.setIdCard(user.getIdcardIDCardNo());
+                            appointmentPersonEntity.setAppointmentStartTime(user.getStartTime());
+                            appointmentPersonEntity.setAppointmentEndTime(user.getEndTime());
+                            appointmentPersonEntity.setBussinessId(user.getBusinessId());
+                            appointmentPersonEntity.setBussinessName(user.getBusinessName());
+                            appointmentPersonEntity.setContactInfo(user.getPhone());
+                            appointmentPersonEntity.setAppontmentNumber(user.getNumber());
+                            appointmentPersonEntity.setCreateUserId(1L);
+                            appointmentPersonEntity.setCreateUserName("系统管理员");
+                            appointmentPersonEntity.setCreateTime(new Date());
+                            return appointmentPersonEntity;
+                        }).collect(Collectors.toList());
+
+
+                        if (!ObjectUtils.isEmpty(newUserList)) {
+                            log.info("注册用户新增，size:{}", newUserList.size());
+                            appointmentPersonService.save(newUserList);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+
+
+    /**
+     * 获取封装得MultipartFile
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return MultipartFile
+     */
+    public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
+        FileItem fileItem = createFileItem(inputStream, fileName);
+        //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象
+        return new CommonsMultipartFile(fileItem);
+    }
+
+
+    /**
+     * FileItem类对象创建
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return FileItem
+     */
+    public FileItem createFileItem(InputStream inputStream, String fileName) {
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        String textFieldName = "file";
+        FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
+        int bytesRead = 0;
+        byte[] buffer = new byte[10 * 1024 * 1024];
+        OutputStream os = null;
+        //使用输出流输出输入流的字节
+        try {
+            os = item.getOutputStream();
+            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            inputStream.close();
+        } catch (IOException e) {
+            log.error("Stream copy exception", e);
+            throw new IllegalArgumentException("文件上传失败");
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+
+                }
+            }
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+                }
+            }
+        }
+
+        return item;
+    }
+
+    public static void main(String[] args) {
+
+
+        System.out.println(DateUtil.parse("19951071", "yyyyMMdd"));
+    }
+
+
+}

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.http.HttpUtil;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.module.person.model.PersonEntity;
+import com.mortals.xhx.module.person.model.PersonQuery;
+import com.mortals.xhx.module.person.service.PersonService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 同步注册用户与预约人数。
+ */
+@Slf4j
+@Service("SyncRegisterUserPicTask")
+public class SyncRegisterUserPicTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private PersonService personService;
+    @Autowired
+    private UploadService uploadService;
+
+    @Value("${php.host:''}")
+    private String host;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("同步注册用户照片任务");
+        syncRegisterUsersPhotos();
+        log.info("同步注册用户任务照片完成");
+
+    }
+
+
+    private void syncRegisterUsersPhotos() {
+        String url = host.endsWith("/") ? host : host + "/";
+        List<PersonEntity> collect = personService.find(new PersonQuery()).stream()
+                .filter(item -> ObjectUtils.isEmpty(item.getPhoto()))
+                .filter(item -> !ObjectUtils.isEmpty(item.getSourcePhotoUri())).collect(Collectors.toList());
+        for (PersonEntity personEntity : collect) {
+            //下载图片到本地保存并更新
+            String downUrl = url + personEntity.getSourcePhotoUri();
+            //String downUrl = "http://192.168.0.98:11078/file/fileupload/1679215657433.jpg";
+            log.info("downUrl:{}",downUrl);
+            byte[] bytes = HttpUtil.downloadBytes(downUrl);
+            if(bytes.length>0){
+                InputStream inputStream = new ByteArrayInputStream(bytes);
+                MultipartFile file = getMultipartFile(inputStream, "photo.jpg");
+                String filePath = uploadService.saveFileUpload(file, "file/fileupload",null);
+                personEntity.setPhoto(filePath);
+                personService.update(personEntity);
+            }
+        }
+    }
+
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+
+
+    /**
+     * 获取封装得MultipartFile
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return MultipartFile
+     */
+    public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
+        FileItem fileItem = createFileItem(inputStream, fileName);
+        //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象
+        return new CommonsMultipartFile(fileItem);
+    }
+
+
+    /**
+     * FileItem类对象创建
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return FileItem
+     */
+    public FileItem createFileItem(InputStream inputStream, String fileName) {
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        String textFieldName = "file";
+        FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
+        int bytesRead = 0;
+        byte[] buffer = new byte[10 * 1024 * 1024];
+        OutputStream os = null;
+        //使用输出流输出输入流的字节
+        try {
+            os = item.getOutputStream();
+            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            inputStream.close();
+        } catch (IOException e) {
+            log.error("Stream copy exception", e);
+            throw new IllegalArgumentException("文件上传失败");
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+
+                }
+            }
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+                }
+            }
+        }
+
+        return item;
+    }
+
+    public static void main(String[] args) {
+
+
+        System.out.println(DateUtil.parse("19951071", "yyyyMMdd"));
+    }
+
+
+}

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.FileUtil;
+import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.busiz.rsp.register.DataItem;
+import com.mortals.xhx.busiz.rsp.register.RegisterDataInfo;
+import com.mortals.xhx.common.code.SourceEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.hik.HikApiRest;
+import com.mortals.xhx.module.hik.door.model.rsp.door.DoorEventDataInfo;
+import com.mortals.xhx.module.person.model.PersonEntity;
+import com.mortals.xhx.module.person.model.PersonQuery;
+import com.mortals.xhx.module.person.service.PersonService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 同步注册用户与预约人数。
+ */
+@Slf4j
+@Service("SyncRegisterUserTask")
+public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private PersonService personService;
+    @Autowired
+    private UploadService uploadService;
+
+    @Value("${php.host:''}")
+    private String host;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("同步注册用户任务");
+        syncRegisterUsers();
+        log.info("同步注册用户任务完成");
+
+        log.info("同步注册用户照片任务");
+        syncRegisterUsersPhotos();
+        log.info("同步注册用户任务照片完成");
+
+    }
+
+
+    private void syncRegisterUsers() {
+        //根据数量查询
+        String registerPath = "/inter/Actuary/peopleList";
+        String url = host + registerPath;
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("page", 1);
+        params.put("size", 1);
+        String respJson = HttpUtil.get(url, params);
+        Rest<RegisterDataInfo> rest = JSON.parseObject(respJson, new TypeReference<Rest<RegisterDataInfo>>() {
+        });
+
+        if (rest.getCode() == YesNoEnum.YES.getValue()) {
+            Integer total = rest.getData().getTotal();
+            if (total > 1) {
+                params = new HashMap<>();
+                params.put("page", 1);
+                params.put("size", total);
+                respJson = HttpUtil.get(url, params);
+                Rest<RegisterDataInfo> restTotal = JSON.parseObject(respJson, new TypeReference<Rest<RegisterDataInfo>>() {
+                });
+
+                if (restTotal.getCode() == YesNoEnum.YES.getValue()) {
+                    //同步所有用户
+                    List<DataItem> userList = restTotal.getData().getData();
+                    log.info("注册用户总数量：{}", userList.size());
+                    if (!ObjectUtils.isEmpty(userList)) {
+                        List<PersonEntity> newUserList = userList.stream().map(user -> {
+                            PersonEntity personEntity = new PersonEntity();
+                            personEntity.initAttrValue();
+                            personEntity.setName(user.getIdcardName());
+                            personEntity.setGender("男".equals(user.getIdcardSex()) ? 0 : 1);
+                            personEntity.setIdCard(user.getIdcardIDCardNo());
+                            personEntity.setPhone(user.getPhone());
+                            personEntity.setAddress(user.getIdcardAddress());
+                            try {
+                                personEntity.setBirthday(DateUtil.parse(IdcardUtil.getBirth(user.getIdcardIDCardNo()), "yyyyMMdd"));
+                            }catch (Exception e){
+                            }
+                            personEntity.setSourceId(user.getId());
+                            personEntity.setSource(SourceEnum.排队叫号系统.getValue());
+                            personEntity.setSourcePhotoUri(user.getIdcardDataPhotoFileName());
+                            return personEntity;
+                        }).collect(Collectors.toList());
+
+                        List<PersonEntity> oldUserList = personService.find(new PersonQuery());
+                        Map<String, PersonEntity> oldUserMap = oldUserList.stream().collect(Collectors.toMap(x -> x.getIdCard(), y -> y, (o, n) -> n));
+                        Map<String, PersonEntity> newUserMap = newUserList.stream().collect(Collectors.toMap(x -> x.getIdCard(), y -> y, (o, n) -> n));
+
+                        List<PersonEntity> updateUserLsit = newUserList.stream().map(item -> {
+                            if (oldUserMap.containsKey(item.getIdCard())) {
+                                PersonEntity personEntity = oldUserMap.get(item.getIdCard());
+                                personEntity.initAttrValue();
+                                personEntity.setName(item.getName());
+                                personEntity.setGender(item.getGender());
+                                personEntity.setPhone(item.getPhone());
+                                personEntity.setAddress(item.getAddress());
+                                personEntity.setBirthday(item.getBirthday());
+                                personEntity.setSourcePhotoUri(item.getSourcePhotoUri());
+                                personEntity.setUpdateUserId(1L);
+                                personEntity.setUpdateTime(new Date());
+                                return personEntity;
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        List<PersonEntity> saveUserList = newUserList.stream().map(item -> {
+                            if (!oldUserMap.containsKey(item.getIdCard())) {
+                                item.setCreateUserId(1L);
+                                item.setCreateUserName("系统管理员");
+                                item.setCreateTime(new Date());
+                                return item;
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        //做差集
+                        List<Long> delUserList = oldUserList.stream().map(item -> {
+                            if (!newUserMap.containsKey(item.getIdCard())) {
+                                return item.getId();
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        if (!ObjectUtils.isEmpty(updateUserLsit)) {
+                            log.info("注册用户更新，size:{}", updateUserLsit.size());
+                            personService.update(updateUserLsit);
+                        }
+
+                        if (!ObjectUtils.isEmpty(saveUserList)) {
+                            log.info("注册用户新增，size:{}", saveUserList.size());
+                            personService.save(saveUserList);
+                        }
+
+                        if (!ObjectUtils.isEmpty(delUserList)) {
+                            log.info("注册用户删除，size:{}", delUserList.size());
+                            personService.remove(delUserList, null);
+                        }
+                    }
+
+
+                }
+            }
+
+
+        }
+
+
+//        Map<String, Integer> params = new HashMap<>();
+//        params.put("page",1);
+//        params.put("size",1);
+//
+//        HttpUtil.doGet(url,params)
+
+    }
+
+    private void syncRegisterUsersPhotos() {
+        String url = host.endsWith("/") ? host : host + "/";
+        List<PersonEntity> collect = personService.find(new PersonQuery()).stream()
+                .filter(item -> ObjectUtils.isEmpty(item.getPhoto()))
+                .filter(item -> !ObjectUtils.isEmpty(item.getSourcePhotoUri())).collect(Collectors.toList());
+        for (PersonEntity personEntity : collect) {
+            //下载图片到本地保存并更新
+            String downUrl = url + personEntity.getSourcePhotoUri();
+           // String downUrl = "http://192.168.0.98:11078/file/fileupload/1679215657433.jpg";
+            log.info("downUrl:{}",downUrl);
+            byte[] bytes = HttpUtil.downloadBytes(downUrl);
+            if(bytes.length>0){
+                InputStream inputStream = new ByteArrayInputStream(bytes);
+                MultipartFile file = getMultipartFile(inputStream, "photo.jpg");
+                String filePath = uploadService.saveFileUpload(file, "file/fileupload",null);
+                personEntity.setPhoto(filePath);
+                personService.update(personEntity);
+            }
+        }
+    }
+
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+
+
+    /**
+     * 获取封装得MultipartFile
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return MultipartFile
+     */
+    public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
+        FileItem fileItem = createFileItem(inputStream, fileName);
+        //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象
+        return new CommonsMultipartFile(fileItem);
+    }
+
+
+    /**
+     * FileItem类对象创建
+     *
+     * @param inputStream inputStream
+     * @param fileName    fileName
+     * @return FileItem
+     */
+    public FileItem createFileItem(InputStream inputStream, String fileName) {
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        String textFieldName = "file";
+        FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
+        int bytesRead = 0;
+        byte[] buffer = new byte[10 * 1024 * 1024];
+        OutputStream os = null;
+        //使用输出流输出输入流的字节
+        try {
+            os = item.getOutputStream();
+            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            inputStream.close();
+        } catch (IOException e) {
+            log.error("Stream copy exception", e);
+            throw new IllegalArgumentException("文件上传失败");
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+
+                }
+            }
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    log.error("Stream close exception", e);
+                }
+            }
+        }
+
+        return item;
+    }
+
+    public static void main(String[] args) {
+
+
+        System.out.println(DateUtil.parse("19951071", "yyyyMMdd"));
+    }
+
+
+}

refined-manager/src/main/java/com/mortals/xhx/module/appointment/dao/AppointmentPersonDao.java

+package com.mortals.xhx.module.appointment.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+import java.util.List;
+/**
+* 预约人员记录Dao
+* 预约人员记录 DAO接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+
+public interface  AppointmentPersonDao extends ICRUDDao<AppointmentPersonEntity,Long>{
+
+
+}

refined-manager/src/main/java/com/mortals/xhx/module/appointment/dao/ibatis/AppointmentPersonDaoImpl.java

+package com.mortals.xhx.module.appointment.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.appointment.dao.AppointmentPersonDao;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 预约人员记录DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Repository("appointmentPersonDao")
+public class AppointmentPersonDaoImpl extends BaseCRUDDaoMybatis<AppointmentPersonEntity,Long> implements AppointmentPersonDao {
+
+
+
+}

refined-manager/src/main/java/com/mortals/xhx/module/appointment/model/AppointmentPersonEntity.java

+package com.mortals.xhx.module.appointment.model;
+
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.appointment.model.vo.AppointmentPersonVo;
+/**
+ * 预约人员记录实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
+
+public class AppointmentPersonEntity extends AppointmentPersonVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 站点Id
+     */
+    private Long siteId;
+    /**
+     * 站点名称
+     */
+    private String siteName;
+    /**
+     * 人员id
+     */
+    @Excel(name = "人员id")
+    private Long personId;
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String contactInfo;
+    /**
+     * 身份证号码
+     */
+    @Excel(name = "身份证号码")
+    private String idCard;
+    /**
+     * 业务Id
+     */
+    private Long bussinessId;
+    /**
+     * 预约业务
+     */
+    @Excel(name = "预约业务")
+    private String bussinessName;
+    /**
+     * 预约编号
+     */
+    @Excel(name = "预约编号")
+    private String appontmentNumber;
+    /**
+     * 预约开始时间
+     */
+    @Excel(name = "预约开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date appointmentStartTime;
+    /**
+     * 预约结束时间
+     */
+    @Excel(name = "预约结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date appointmentEndTime;
+
+
+
+    public AppointmentPersonEntity(){}
+    /**
+     * 获取 站点Id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点Id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+    /**
+     * 获取 站点名称
+     * @return String
+     */
+    public String getSiteName(){
+        return siteName;
+    }
+    /**
+     * 设置 站点名称
+     * @param siteName
+     */
+    public void setSiteName(String siteName){
+        this.siteName = siteName;
+    }
+    /**
+     * 获取 人员id
+     * @return Long
+     */
+    public Long getPersonId(){
+        return personId;
+    }
+    /**
+     * 设置 人员id
+     * @param personId
+     */
+    public void setPersonId(Long personId){
+        this.personId = personId;
+    }
+    /**
+     * 获取 姓名
+     * @return String
+     */
+    public String getName(){
+        return name;
+    }
+    /**
+     * 设置 姓名
+     * @param name
+     */
+    public void setName(String name){
+        this.name = name;
+    }
+    /**
+     * 获取 联系方式
+     * @return String
+     */
+    public String getContactInfo(){
+        return contactInfo;
+    }
+    /**
+     * 设置 联系方式
+     * @param contactInfo
+     */
+    public void setContactInfo(String contactInfo){
+        this.contactInfo = contactInfo;
+    }
+    /**
+     * 获取 身份证号码
+     * @return String
+     */
+    public String getIdCard(){
+        return idCard;
+    }
+    /**
+     * 设置 身份证号码
+     * @param idCard
+     */
+    public void setIdCard(String idCard){
+        this.idCard = idCard;
+    }
+    /**
+     * 获取 业务Id
+     * @return Long
+     */
+    public Long getBussinessId(){
+        return bussinessId;
+    }
+    /**
+     * 设置 业务Id
+     * @param bussinessId
+     */
+    public void setBussinessId(Long bussinessId){
+        this.bussinessId = bussinessId;
+    }
+    /**
+     * 获取 预约业务
+     * @return String
+     */
+    public String getBussinessName(){
+        return bussinessName;
+    }
+    /**
+     * 设置 预约业务
+     * @param bussinessName
+     */
+    public void setBussinessName(String bussinessName){
+        this.bussinessName = bussinessName;
+    }
+    /**
+     * 获取 预约编号
+     * @return String
+     */
+    public String getAppontmentNumber(){
+        return appontmentNumber;
+    }
+    /**
+     * 设置 预约编号
+     * @param appontmentNumber
+     */
+    public void setAppontmentNumber(String appontmentNumber){
+        this.appontmentNumber = appontmentNumber;
+    }
+    /**
+     * 获取 预约开始时间
+     * @return Date
+     */
+    public Date getAppointmentStartTime(){
+        return appointmentStartTime;
+    }
+    /**
+     * 设置 预约开始时间
+     * @param appointmentStartTime
+     */
+    public void setAppointmentStartTime(Date appointmentStartTime){
+        this.appointmentStartTime = appointmentStartTime;
+    }
+    /**
+     * 获取 预约结束时间
+     * @return Date
+     */
+    public Date getAppointmentEndTime(){
+        return appointmentEndTime;
+    }
+    /**
+     * 设置 预约结束时间
+     * @param appointmentEndTime
+     */
+    public void setAppointmentEndTime(Date appointmentEndTime){
+        this.appointmentEndTime = appointmentEndTime;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof AppointmentPersonEntity) {
+            AppointmentPersonEntity tmp = (AppointmentPersonEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",siteId:").append(getSiteId());
+        sb.append(",siteName:").append(getSiteName());
+        sb.append(",personId:").append(getPersonId());
+        sb.append(",name:").append(getName());
+        sb.append(",contactInfo:").append(getContactInfo());
+        sb.append(",idCard:").append(getIdCard());
+        sb.append(",bussinessId:").append(getBussinessId());
+        sb.append(",bussinessName:").append(getBussinessName());
+        sb.append(",appontmentNumber:").append(getAppontmentNumber());
+        sb.append(",appointmentStartTime:").append(getAppointmentStartTime());
+        sb.append(",appointmentEndTime:").append(getAppointmentEndTime());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.siteId = null;
+
+        this.siteName = "";
+
+        this.personId = null;
+
+        this.name = "";
+
+        this.contactInfo = "";
+
+        this.idCard = "";
+
+        this.bussinessId = null;
+
+        this.bussinessName = "";
+
+        this.appontmentNumber = "";
+
+        this.appointmentStartTime = null;
+
+        this.appointmentEndTime = null;
+    }
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/appointment/model/AppointmentPersonQuery.java

+package com.mortals.xhx.module.appointment.model;
+
+import java.util.Date;
+import java.util.List;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+/**
+ * 预约人员记录查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
+public class AppointmentPersonQuery extends AppointmentPersonEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 站点Id */
+    private Long siteIdStart;
+
+    /** 结束 站点Id */
+    private Long siteIdEnd;
+
+    /** 增加 站点Id */
+    private Long siteIdIncrement;
+
+    /** 站点Id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点Id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 开始 人员id */
+    private Long personIdStart;
+
+    /** 结束 人员id */
+    private Long personIdEnd;
+
+    /** 增加 人员id */
+    private Long personIdIncrement;
+
+    /** 人员id列表 */
+    private List <Long> personIdList;
+
+    /** 人员id排除列表 */
+    private List <Long> personIdNotList;
+
+    /** 姓名 */
+    private List<String> nameList;
+
+    /** 姓名排除列表 */
+    private List <String> nameNotList;
+    /** 联系方式 */
+    private List<String> contactInfoList;
+
+    /** 联系方式排除列表 */
+    private List <String> contactInfoNotList;
+    /** 身份证号码 */
+    private List<String> idCardList;
+
+    /** 身份证号码排除列表 */
+    private List <String> idCardNotList;
+    /** 开始 业务Id */
+    private Long bussinessIdStart;
+
+    /** 结束 业务Id */
+    private Long bussinessIdEnd;
+
+    /** 增加 业务Id */
+    private Long bussinessIdIncrement;
+
+    /** 业务Id列表 */
+    private List <Long> bussinessIdList;
+
+    /** 业务Id排除列表 */
+    private List <Long> bussinessIdNotList;
+
+    /** 预约业务 */
+    private List<String> bussinessNameList;
+
+    /** 预约业务排除列表 */
+    private List <String> bussinessNameNotList;
+    /** 预约编号 */
+    private List<String> appontmentNumberList;
+
+    /** 预约编号排除列表 */
+    private List <String> appontmentNumberNotList;
+    /** 开始 预约开始时间 */
+    private String appointmentStartTimeStart;
+
+    /** 结束 预约开始时间 */
+    private String appointmentStartTimeEnd;
+
+    /** 开始 预约结束时间 */
+    private String appointmentEndTimeStart;
+
+    /** 结束 预约结束时间 */
+    private String appointmentEndTimeEnd;
+
+    /** 开始 创建人id */
+    private Long createUserIdStart;
+
+    /** 结束 创建人id */
+    private Long createUserIdEnd;
+
+    /** 增加 创建人id */
+    private Long createUserIdIncrement;
+
+    /** 创建人id列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建人id排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新人id */
+    private Long updateUserIdStart;
+
+    /** 结束 更新人id */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新人id */
+    private Long updateUserIdIncrement;
+
+    /** 更新人id列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新人id排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<AppointmentPersonQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AppointmentPersonQuery> andConditionList;
+
+    public AppointmentPersonQuery(){}
+
+    /**
+     * 获取 开始 主键ID，主键，自增长
+     * @return idStart
+     */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+     * 设置 开始 主键ID，主键，自增长
+     * @param idStart
+     */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+     * 获取 结束 主键ID，主键，自增长
+     * @return $idEnd
+     */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+     * 设置 结束 主键ID，主键，自增长
+     * @param idEnd
+     */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+     * 获取 增加 主键ID，主键，自增长
+     * @return idIncrement
+     */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+     * 设置 增加 主键ID，主键，自增长
+     * @param idIncrement
+     */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+     * 获取 主键ID，主键，自增长
+     * @return idList
+     */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+     * 设置 主键ID，主键，自增长
+     * @param idList
+     */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+     * 获取 主键ID，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 主键ID，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 获取 开始 站点Id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点Id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点Id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点Id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点Id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 获取 站点名称
+     * @return siteNameList
+     */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameList
+     */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+
+    /**
+     * 获取 站点名称
+     * @return siteNameNotList
+     */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameNotList
+     */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
+    /**
+     * 获取 开始 人员id
+     * @return personIdStart
+     */
+    public Long getPersonIdStart(){
+        return this.personIdStart;
+    }
+
+    /**
+     * 设置 开始 人员id
+     * @param personIdStart
+     */
+    public void setPersonIdStart(Long personIdStart){
+        this.personIdStart = personIdStart;
+    }
+
+    /**
+     * 获取 结束 人员id
+     * @return $personIdEnd
+     */
+    public Long getPersonIdEnd(){
+        return this.personIdEnd;
+    }
+
+    /**
+     * 设置 结束 人员id
+     * @param personIdEnd
+     */
+    public void setPersonIdEnd(Long personIdEnd){
+        this.personIdEnd = personIdEnd;
+    }
+
+    /**
+     * 获取 增加 人员id
+     * @return personIdIncrement
+     */
+    public Long getPersonIdIncrement(){
+        return this.personIdIncrement;
+    }
+
+    /**
+     * 设置 增加 人员id
+     * @param personIdIncrement
+     */
+    public void setPersonIdIncrement(Long personIdIncrement){
+        this.personIdIncrement = personIdIncrement;
+    }
+
+    /**
+     * 获取 人员id
+     * @return personIdList
+     */
+    public List<Long> getPersonIdList(){
+        return this.personIdList;
+    }
+
+    /**
+     * 设置 人员id
+     * @param personIdList
+     */
+    public void setPersonIdList(List<Long> personIdList){
+        this.personIdList = personIdList;
+    }
+
+    /**
+     * 获取 人员id
+     * @return personIdNotList
+     */
+    public List<Long> getPersonIdNotList(){
+        return this.personIdNotList;
+    }
+
+    /**
+     * 设置 人员id
+     * @param personIdNotList
+     */
+    public void setPersonIdNotList(List<Long> personIdNotList){
+        this.personIdNotList = personIdNotList;
+    }
+
+
+    /**
+     * 获取 姓名
+     * @return nameList
+     */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+     * 设置 姓名
+     * @param nameList
+     */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+
+    /**
+     * 获取 姓名
+     * @return nameNotList
+     */
+    public List<String> getNameNotList(){
+        return this.nameNotList;
+    }
+
+    /**
+     * 设置 姓名
+     * @param nameNotList
+     */
+    public void setNameNotList(List<String> nameNotList){
+        this.nameNotList = nameNotList;
+    }
+
+    /**
+     * 获取 联系方式
+     * @return contactInfoList
+     */
+    public List<String> getContactInfoList(){
+        return this.contactInfoList;
+    }
+
+    /**
+     * 设置 联系方式
+     * @param contactInfoList
+     */
+    public void setContactInfoList(List<String> contactInfoList){
+        this.contactInfoList = contactInfoList;
+    }
+
+    /**
+     * 获取 联系方式
+     * @return contactInfoNotList
+     */
+    public List<String> getContactInfoNotList(){
+        return this.contactInfoNotList;
+    }
+
+    /**
+     * 设置 联系方式
+     * @param contactInfoNotList
+     */
+    public void setContactInfoNotList(List<String> contactInfoNotList){
+        this.contactInfoNotList = contactInfoNotList;
+    }
+
+    /**
+     * 获取 身份证号码
+     * @return idCardList
+     */
+    public List<String> getIdCardList(){
+        return this.idCardList;
+    }
+
+    /**
+     * 设置 身份证号码
+     * @param idCardList
+     */
+    public void setIdCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+    }
+
+    /**
+     * 获取 身份证号码
+     * @return idCardNotList
+     */
+    public List<String> getIdCardNotList(){
+        return this.idCardNotList;
+    }
+
+    /**
+     * 设置 身份证号码
+     * @param idCardNotList
+     */
+    public void setIdCardNotList(List<String> idCardNotList){
+        this.idCardNotList = idCardNotList;
+    }
+
+    /**
+     * 获取 开始 业务Id
+     * @return bussinessIdStart
+     */
+    public Long getBussinessIdStart(){
+        return this.bussinessIdStart;
+    }
+
+    /**
+     * 设置 开始 业务Id
+     * @param bussinessIdStart
+     */
+    public void setBussinessIdStart(Long bussinessIdStart){
+        this.bussinessIdStart = bussinessIdStart;
+    }
+
+    /**
+     * 获取 结束 业务Id
+     * @return $bussinessIdEnd
+     */
+    public Long getBussinessIdEnd(){
+        return this.bussinessIdEnd;
+    }
+
+    /**
+     * 设置 结束 业务Id
+     * @param bussinessIdEnd
+     */
+    public void setBussinessIdEnd(Long bussinessIdEnd){
+        this.bussinessIdEnd = bussinessIdEnd;
+    }
+
+    /**
+     * 获取 增加 业务Id
+     * @return bussinessIdIncrement
+     */
+    public Long getBussinessIdIncrement(){
+        return this.bussinessIdIncrement;
+    }
+
+    /**
+     * 设置 增加 业务Id
+     * @param bussinessIdIncrement
+     */
+    public void setBussinessIdIncrement(Long bussinessIdIncrement){
+        this.bussinessIdIncrement = bussinessIdIncrement;
+    }
+
+    /**
+     * 获取 业务Id
+     * @return bussinessIdList
+     */
+    public List<Long> getBussinessIdList(){
+        return this.bussinessIdList;
+    }
+
+    /**
+     * 设置 业务Id
+     * @param bussinessIdList
+     */
+    public void setBussinessIdList(List<Long> bussinessIdList){
+        this.bussinessIdList = bussinessIdList;
+    }
+
+    /**
+     * 获取 业务Id
+     * @return bussinessIdNotList
+     */
+    public List<Long> getBussinessIdNotList(){
+        return this.bussinessIdNotList;
+    }
+
+    /**
+     * 设置 业务Id
+     * @param bussinessIdNotList
+     */
+    public void setBussinessIdNotList(List<Long> bussinessIdNotList){
+        this.bussinessIdNotList = bussinessIdNotList;
+    }
+
+
+    /**
+     * 获取 预约业务
+     * @return bussinessNameList
+     */
+    public List<String> getBussinessNameList(){
+        return this.bussinessNameList;
+    }
+
+    /**
+     * 设置 预约业务
+     * @param bussinessNameList
+     */
+    public void setBussinessNameList(List<String> bussinessNameList){
+        this.bussinessNameList = bussinessNameList;
+    }
+
+    /**
+     * 获取 预约业务
+     * @return bussinessNameNotList
+     */
+    public List<String> getBussinessNameNotList(){
+        return this.bussinessNameNotList;
+    }
+
+    /**
+     * 设置 预约业务
+     * @param bussinessNameNotList
+     */
+    public void setBussinessNameNotList(List<String> bussinessNameNotList){
+        this.bussinessNameNotList = bussinessNameNotList;
+    }
+
+    /**
+     * 获取 预约编号
+     * @return appontmentNumberList
+     */
+    public List<String> getAppontmentNumberList(){
+        return this.appontmentNumberList;
+    }
+
+    /**
+     * 设置 预约编号
+     * @param appontmentNumberList
+     */
+    public void setAppontmentNumberList(List<String> appontmentNumberList){
+        this.appontmentNumberList = appontmentNumberList;
+    }
+
+    /**
+     * 获取 预约编号
+     * @return appontmentNumberNotList
+     */
+    public List<String> getAppontmentNumberNotList(){
+        return this.appontmentNumberNotList;
+    }
+
+    /**
+     * 设置 预约编号
+     * @param appontmentNumberNotList
+     */
+    public void setAppontmentNumberNotList(List<String> appontmentNumberNotList){
+        this.appontmentNumberNotList = appontmentNumberNotList;
+    }
+
+    /**
+     * 获取 开始 预约开始时间
+     * @return appointmentStartTimeStart
+     */
+    public String getAppointmentStartTimeStart(){
+        return this.appointmentStartTimeStart;
+    }
+
+    /**
+     * 设置 开始 预约开始时间
+     * @param appointmentStartTimeStart
+     */
+    public void setAppointmentStartTimeStart(String appointmentStartTimeStart){
+        this.appointmentStartTimeStart = appointmentStartTimeStart;
+    }
+
+    /**
+     * 获取 结束 预约开始时间
+     * @return appointmentStartTimeEnd
+     */
+    public String getAppointmentStartTimeEnd(){
+        return this.appointmentStartTimeEnd;
+    }
+
+    /**
+     * 设置 结束 预约开始时间
+     * @param appointmentStartTimeEnd
+     */
+    public void setAppointmentStartTimeEnd(String appointmentStartTimeEnd){
+        this.appointmentStartTimeEnd = appointmentStartTimeEnd;
+    }
+
+    /**
+     * 获取 开始 预约结束时间
+     * @return appointmentEndTimeStart
+     */
+    public String getAppointmentEndTimeStart(){
+        return this.appointmentEndTimeStart;
+    }
+
+    /**
+     * 设置 开始 预约结束时间
+     * @param appointmentEndTimeStart
+     */
+    public void setAppointmentEndTimeStart(String appointmentEndTimeStart){
+        this.appointmentEndTimeStart = appointmentEndTimeStart;
+    }
+
+    /**
+     * 获取 结束 预约结束时间
+     * @return appointmentEndTimeEnd
+     */
+    public String getAppointmentEndTimeEnd(){
+        return this.appointmentEndTimeEnd;
+    }
+
+    /**
+     * 设置 结束 预约结束时间
+     * @param appointmentEndTimeEnd
+     */
+    public void setAppointmentEndTimeEnd(String appointmentEndTimeEnd){
+        this.appointmentEndTimeEnd = appointmentEndTimeEnd;
+    }
+
+    /**
+     * 获取 开始 创建人id
+     * @return createUserIdStart
+     */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+     * 设置 开始 创建人id
+     * @param createUserIdStart
+     */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+     * 获取 结束 创建人id
+     * @return $createUserIdEnd
+     */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+     * 设置 结束 创建人id
+     * @param createUserIdEnd
+     */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+     * 获取 增加 创建人id
+     * @return createUserIdIncrement
+     */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+     * 设置 增加 创建人id
+     * @param createUserIdIncrement
+     */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+     * 获取 创建人id
+     * @return createUserIdList
+     */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+     * 设置 创建人id
+     * @param createUserIdList
+     */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+     * 获取 创建人id
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建人id
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+     * 获取 开始 创建时间
+     * @return createTimeStart
+     */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+     * 设置 开始 创建时间
+     * @param createTimeStart
+     */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+     * 获取 结束 创建时间
+     * @return createTimeEnd
+     */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+     * 设置 结束 创建时间
+     * @param createTimeEnd
+     */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+     * 获取 开始 更新人id
+     * @return updateUserIdStart
+     */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+     * 设置 开始 更新人id
+     * @param updateUserIdStart
+     */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+     * 获取 结束 更新人id
+     * @return $updateUserIdEnd
+     */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+     * 设置 结束 更新人id
+     * @param updateUserIdEnd
+     */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+     * 获取 增加 更新人id
+     * @return updateUserIdIncrement
+     */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+     * 设置 增加 更新人id
+     * @param updateUserIdIncrement
+     */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+     * 获取 更新人id
+     * @return updateUserIdList
+     */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+     * 设置 更新人id
+     * @param updateUserIdList
+     */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+     * 获取 更新人id
+     * @return updateUserIdNotList
+     */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+     * 设置 更新人id
+     * @param updateUserIdNotList
+     */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+     * 获取 开始 更新时间
+     * @return updateTimeStart
+     */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+     * 设置 开始 更新时间
+     * @param updateTimeStart
+     */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
+     */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+     * 设置  主键ID，主键，自增长
+     * @param id
+     */
+    public AppointmentPersonQuery id(Long id){
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 主键ID，主键，自增长
+     * @param idStart
+     */
+    public AppointmentPersonQuery idStart(Long idStart){
+        this.idStart = idStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 主键ID，主键，自增长
+     * @param idEnd
+     */
+    public AppointmentPersonQuery idEnd(Long idEnd){
+        this.idEnd = idEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 主键ID，主键，自增长
+     * @param idIncrement
+     */
+    public AppointmentPersonQuery idIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 主键ID，主键，自增长
+     * @param idList
+     */
+    public AppointmentPersonQuery idList(List<Long> idList){
+        this.idList = idList;
+        return this;
+    }
+
+    /**
+     * 设置 主键ID，主键，自增长
+     * @param idNotList
+     */
+    public AppointmentPersonQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+    /**
+     * 设置  站点Id
+     * @param siteId
+     */
+    public AppointmentPersonQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
+    public AppointmentPersonQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
+    public AppointmentPersonQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
+    public AppointmentPersonQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdList
+     */
+    public AppointmentPersonQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public AppointmentPersonQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 站点名称
+     * @param siteName
+     */
+    public AppointmentPersonQuery siteName(String siteName){
+        setSiteName(siteName);
+        return this;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameList
+     */
+    public AppointmentPersonQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+        return this;
+    }
+
+    /**
+     * 设置  人员id
+     * @param personId
+     */
+    public AppointmentPersonQuery personId(Long personId){
+        setPersonId(personId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 人员id
+     * @param personIdStart
+     */
+    public AppointmentPersonQuery personIdStart(Long personIdStart){
+        this.personIdStart = personIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 人员id
+     * @param personIdEnd
+     */
+    public AppointmentPersonQuery personIdEnd(Long personIdEnd){
+        this.personIdEnd = personIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 人员id
+     * @param personIdIncrement
+     */
+    public AppointmentPersonQuery personIdIncrement(Long personIdIncrement){
+        this.personIdIncrement = personIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 人员id
+     * @param personIdList
+     */
+    public AppointmentPersonQuery personIdList(List<Long> personIdList){
+        this.personIdList = personIdList;
+        return this;
+    }
+
+    /**
+     * 设置 人员id
+     * @param personIdNotList
+     */
+    public AppointmentPersonQuery personIdNotList(List<Long> personIdNotList){
+        this.personIdNotList = personIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 姓名
+     * @param name
+     */
+    public AppointmentPersonQuery name(String name){
+        setName(name);
+        return this;
+    }
+
+    /**
+     * 设置 姓名
+     * @param nameList
+     */
+    public AppointmentPersonQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 联系方式
+     * @param contactInfo
+     */
+    public AppointmentPersonQuery contactInfo(String contactInfo){
+        setContactInfo(contactInfo);
+        return this;
+    }
+
+    /**
+     * 设置 联系方式
+     * @param contactInfoList
+     */
+    public AppointmentPersonQuery contactInfoList(List<String> contactInfoList){
+        this.contactInfoList = contactInfoList;
+        return this;
+    }
+
+
+    /**
+     * 设置 身份证号码
+     * @param idCard
+     */
+    public AppointmentPersonQuery idCard(String idCard){
+        setIdCard(idCard);
+        return this;
+    }
+
+    /**
+     * 设置 身份证号码
+     * @param idCardList
+     */
+    public AppointmentPersonQuery idCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+        return this;
+    }
+
+    /**
+     * 设置  业务Id
+     * @param bussinessId
+     */
+    public AppointmentPersonQuery bussinessId(Long bussinessId){
+        setBussinessId(bussinessId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 业务Id
+     * @param bussinessIdStart
+     */
+    public AppointmentPersonQuery bussinessIdStart(Long bussinessIdStart){
+        this.bussinessIdStart = bussinessIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 业务Id
+     * @param bussinessIdEnd
+     */
+    public AppointmentPersonQuery bussinessIdEnd(Long bussinessIdEnd){
+        this.bussinessIdEnd = bussinessIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 业务Id
+     * @param bussinessIdIncrement
+     */
+    public AppointmentPersonQuery bussinessIdIncrement(Long bussinessIdIncrement){
+        this.bussinessIdIncrement = bussinessIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 业务Id
+     * @param bussinessIdList
+     */
+    public AppointmentPersonQuery bussinessIdList(List<Long> bussinessIdList){
+        this.bussinessIdList = bussinessIdList;
+        return this;
+    }
+
+    /**
+     * 设置 业务Id
+     * @param bussinessIdNotList
+     */
+    public AppointmentPersonQuery bussinessIdNotList(List<Long> bussinessIdNotList){
+        this.bussinessIdNotList = bussinessIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 预约业务
+     * @param bussinessName
+     */
+    public AppointmentPersonQuery bussinessName(String bussinessName){
+        setBussinessName(bussinessName);
+        return this;
+    }
+
+    /**
+     * 设置 预约业务
+     * @param bussinessNameList
+     */
+    public AppointmentPersonQuery bussinessNameList(List<String> bussinessNameList){
+        this.bussinessNameList = bussinessNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 预约编号
+     * @param appontmentNumber
+     */
+    public AppointmentPersonQuery appontmentNumber(String appontmentNumber){
+        setAppontmentNumber(appontmentNumber);
+        return this;
+    }
+
+    /**
+     * 设置 预约编号
+     * @param appontmentNumberList
+     */
+    public AppointmentPersonQuery appontmentNumberList(List<String> appontmentNumberList){
+        this.appontmentNumberList = appontmentNumberList;
+        return this;
+    }
+
+
+
+    /**
+     * 设置  创建人id
+     * @param createUserId
+     */
+    public AppointmentPersonQuery createUserId(Long createUserId){
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建人id
+     * @param createUserIdStart
+     */
+    public AppointmentPersonQuery createUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 创建人id
+     * @param createUserIdEnd
+     */
+    public AppointmentPersonQuery createUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 创建人id
+     * @param createUserIdIncrement
+     */
+    public AppointmentPersonQuery createUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 创建人id
+     * @param createUserIdList
+     */
+    public AppointmentPersonQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+        return this;
+    }
+
+    /**
+     * 设置 创建人id
+     * @param createUserIdNotList
+     */
+    public AppointmentPersonQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置  更新人id
+     * @param updateUserId
+     */
+    public AppointmentPersonQuery updateUserId(Long updateUserId){
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 更新人id
+     * @param updateUserIdStart
+     */
+    public AppointmentPersonQuery updateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 更新人id
+     * @param updateUserIdEnd
+     */
+    public AppointmentPersonQuery updateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 更新人id
+     * @param updateUserIdIncrement
+     */
+    public AppointmentPersonQuery updateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 更新人id
+     * @param updateUserIdList
+     */
+    public AppointmentPersonQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+        return this;
+    }
+
+    /**
+     * 设置 更新人id
+     * @param updateUserIdNotList
+     */
+    public AppointmentPersonQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
+    public List<AppointmentPersonQuery> getOrConditionList(){
+        return this.orConditionList;
+    }
+
+    /**
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
+    public void setOrConditionList(List<AppointmentPersonQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
+    public List<AppointmentPersonQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
+    public void setAndConditionList(List<AppointmentPersonQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/appointment/model/vo/AppointmentPersonVo.java

+package com.mortals.xhx.module.appointment.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 预约人员记录视图对象
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Data
+public class AppointmentPersonVo extends BaseEntityLong {
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/appointment/service/AppointmentPersonService.java

+package com.mortals.xhx.module.appointment.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+/**
+* AppointmentPersonService
+*
+* 预约人员记录 service接口
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+public interface AppointmentPersonService extends ICRUDService<AppointmentPersonEntity,Long>{
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/appointment/service/impl/AppointmentPersonServiceImpl.java

+package com.mortals.xhx.module.appointment.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.appointment.dao.AppointmentPersonDao;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+import com.mortals.xhx.module.appointment.service.AppointmentPersonService;
+/**
+* AppointmentPersonService
+* 预约人员记录 service实现
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@Service("appointmentPersonService")
+public class AppointmentPersonServiceImpl extends AbstractCRUDServiceImpl<AppointmentPersonDao, AppointmentPersonEntity, Long> implements AppointmentPersonService {
+    
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/appointment/web/AppointmentPersonController.java

+package com.mortals.xhx.module.appointment.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
+import com.mortals.xhx.module.appointment.service.AppointmentPersonService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 预约人员记录
+*
+* @author zxfei
+* @date 2023-04-16
+*/
+@RestController
+@RequestMapping("appointment/person")
+public class AppointmentPersonController extends BaseCRUDJsonBodyMappingController<AppointmentPersonService,AppointmentPersonEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public AppointmentPersonController(){
+        super.setModuleDesc( "预约人员记录");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/EventData.java

 package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import java.util.List;
+
 import lombok.Data;
 
 @Data
-public class EventData{
-	private FaceRecognitionResult faceRecognitionResult;
-	private String srcEventId;
-	private List<ResInfoItem> resInfo;
+public class EventData {
+    /**
+     * 识别结果
+     */
+    private FaceRecognitionResult faceRecognitionResult;
+    /**
+     * 源事件的唯一标识，即转自的人脸比对事件的唯一标识
+     */
+    private String srcEventId;
+    /**
+     * 触发重点人员识别事件的报警的抓拍点的信息
+     */
+    private List<ResInfoItem> resInfo;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/EventsItem.java

@@ -8,15 +8,33 @@ import java.util.Date;
 
 @Data
 public class EventsItem {
+    //事件唯一标识
     private String eventId;
+    //
     private EventData data;
-    private int eventType;
+    //事件类型
+    private Integer eventType;
+    //事件源编号，物理设备是资源编号
     private String srcIndex;
+    //事件类别
     private String ability;
+    //事件源类型
     private String srcType;
-    private int timeout;
+    //脉冲超时时间
+    private Integer timeout;
     @JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    /**
+     * 事件发生时间（设备时间）
+     */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
     private Date happenTime;
+    /**
+     * 事件状态
+     * 0-瞬时
+     * 1-开始
+     * 2-停止
+     * 3-事件脉冲
+     * 4-事件联动结果更新
+     */
     private int status;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/FaceMatchItem.java

@@ -4,13 +4,40 @@ import lombok.Data;
 
 @Data
 public class FaceMatchItem{
-	private String faceGroupName;
-	private String faceInfoSex;
-	private Double similarity;
-	private String facePicUrl;
-	private String certificate;
+	/**
+	 * 目标所属的人脸分组的唯一标识
+	 */
 	private String faceGroupCode;
+	/**
+	 * 目标所属的人脸分组的名称
+	 */
+	private String faceGroupName;
+	/**
+	 * 目标对应的人脸的唯一标识
+	 */
 	private String faceInfoCode;
+	/**
+	 * 目标对应的人脸的名称
+	 */
 	private String faceInfoName;
+	/**
+	 * 目标对应的人脸的性别
+	 */
+	private String faceInfoSex;
+	/**
+	 * 目标对应的人脸的证件类型
+	 */
 	private String certificateType;
+	/**
+	 * 目标对应的人脸的证件号码
+	 */
+	private String certificate;
+	/**
+	 * 目标人脸和抓拍人脸的相似度
+	 */
+	private Double similarity;
+	/**
+	 * 目标人脸的图片
+	 */
+	private String facePicUrl;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/FaceRecognitionResult.java

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class FaceRecognitionResult{
-	private List<FaceMatchItem> faceMatch;
+	/**
+	 * 抓拍信息
+	 */
 	private Snap snap;
+	/**
+	 * 识别到的目标信息 可能有1-5个目标
+	 */
+	private List<FaceMatchItem> faceMatch;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/Snap.java

@@ -6,10 +6,28 @@ import java.util.Date;
 
 @Data
 public class Snap{
+	/**
+	 * 人脸图片URI
+	 */
 	private String faceUrl;
+	/**
+	 * 抓拍图片的时间
+	 */
 	private Date faceTime;
+	/**
+	 * 是否戴眼镜
+	 */
 	private String glass;
+	/**
+	 * 性别
+	 */
 	private String gender;
+	/**
+	 * 年龄段
+	 */
 	private String ageGroup;
+	/**
+	 * 背景图片URL
+	 */
 	private String bkgUrl;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java

@@ -4,16 +4,25 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.xhx.common.code.HikEventTypeEnum;
+import com.mortals.xhx.common.key.ParamKey;
 import com.mortals.xhx.module.hik.AbstractHikService;
 import com.mortals.xhx.module.hik.HikApiRest;
-import com.mortals.xhx.module.hik.event.model.req.callback.EventRecognBlackReq;
+import com.mortals.xhx.module.hik.event.model.req.callback.*;
 import com.mortals.xhx.module.hik.event.model.req.sub.EventSubReq;
 import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
 import com.mortals.xhx.module.hik.event.service.IHikEventService;
+import com.mortals.xhx.module.person.service.PersonService;
+import com.mortals.xhx.module.realtime.model.RealtimeDataflowEntity;
+import com.mortals.xhx.module.realtime.service.RealtimeDataflowService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +35,10 @@ import java.util.List;
 @Slf4j
 public class HikEventServiceImpl extends AbstractHikService implements IHikEventService {
 
+    @Autowired
+    private RealtimeDataflowService dataflowService;
+    @Autowired
+    private PersonService personService;
 
     @Override
     public Rest<String> subEvent(EventSubReq eventSubReq) {
@@ -92,8 +105,63 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
     }
 
     @Override
-    public Rest<String> handleEvent(EventRecognBlackReq eventRecognBlackReq) {
+    public Rest<String> handleEvent(EventRecognBlackReq req) {
         //处理识别业务 todo
+        Double similarity = DataUtil.converStr2Double(GlobalSysInfo.getParamValue(ParamKey.PARAM_FACE_SIMILARITY, "0.8"), 0);
+        //String similarity = GlobalSysInfo.getParamValue(ParamKey.PARAM_FACE_SIMILARITY, "0.8");
+
+        Params params = req.getParams();
+        if (HikEventTypeEnum.重点人员识别事件.getValue().equals(params.getAbility())) {
+            params.getEvents();
+            for (EventsItem event : params.getEvents()) {
+                //事件详细
+                String eventId = event.getEventId();
+                int eventType = event.getEventType();
+                EventData eventData = event.getData();
+                //识别结果
+                FaceRecognitionResult faceRecognitionResult = eventData.getFaceRecognitionResult();
+                //抓拍信息
+                Snap snap = faceRecognitionResult.getSnap();
+                //匹配的结果
+                List<FaceMatchItem> faceMatchs = faceRecognitionResult.getFaceMatch();
+                for (FaceMatchItem faceMatch : faceMatchs) {
+                    //不论识别结果 保存流量数据
+                    RealtimeDataflowEntity realtimeDataflowEntity = new RealtimeDataflowEntity();
+
+//                    realtimeDataflowEntity.setPersonId();
+//                    realtimeDataflowEntity.setName();
+//                    realtimeDataflowEntity.setDevice();
+//                    realtimeDataflowEntity.setDetectTime();
+//                    realtimeDataflowEntity.setContact();
+//                    realtimeDataflowEntity.setIdNumber();
+//                    realtimeDataflowEntity.setIsBooking();
+//                    realtimeDataflowEntity.setQueueNum();
+//                    realtimeDataflowEntity.setLocation();
+//                    realtimeDataflowEntity.setPicture();
+//                    realtimeDataflowEntity.setOrderCols();
+//                    realtimeDataflowEntity.setOrderColList();
+
+                    realtimeDataflowEntity.setCreateUserId(1L);
+                    realtimeDataflowEntity.setCreateTime(new Date());
+                    realtimeDataflowEntity.setCreateUserName("system");
+
+
+                    realtimeDataflowEntity.initAttrValue();
+
+                    //dataflowService.save()
+
+                    //根据匹配结果 保存业务数据 todo
+                    if(faceMatch.getSimilarity()>similarity){
+                        //保存当前识别结果到记录表中
+
+                    }else {
+                        //识别为陌生人 保存
+                    }
+                }
+
+
+            }
+        }
 
         return Rest.ok("处理成功！");
     }

refined-manager/src/main/java/com/mortals/xhx/module/person/model/PersonEntity.java

@@ -8,271 +8,307 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.person.model.vo.PersonVo;
 /**
-* 注册人员实体对象
-*
-* @author zxfei
-* @date 2023-04-09
-*/
+ * 注册人员实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
 
 public class PersonEntity extends PersonVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点Id
-    */
+     * 站点Id
+     */
     private Long siteId;
     /**
-    * 站点名称
-    */
+     * 站点名称
+     */
     private String siteName;
     /**
-    * 用户名称
-    */
+     * 用户名称
+     */
     private String name;
     /**
-    * 身份证号码
-    */
+     * 身份证号码
+     */
     private String idCard;
     /**
-    * 性别(0.男,1.女)
-    */
+     * 性别(0.男,1.女)
+     */
     @Excel(name = "性别", readConverterExp = "0=男,1.女")
     private Integer gender;
     /**
-    * 手机号码
-    */
+     * 手机号码
+     */
     private String phone;
     /**
-    * 出生日期
-    */
+     * 出生日期
+     */
     @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date birthday;
     /**
-    * 家庭住址
-    */
+     * 家庭住址
+     */
     @Excel(name = "家庭住址")
     private String address;
     /**
-    * 照片路径
-    */
+     * 本地照片路径
+     */
     private String photo;
     /**
-    * 备注
-    */
+     * 原始照片路径
+     */
+    private String sourcePhotoUri;
+    /**
+     * Php原始注册用户id
+     */
+    private Long sourceId;
+    /**
+     * 备注
+     */
     private String remark;
     /**
-    * 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    */
+     * 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     */
     private Integer source;
     /**
-    * 是否添加到海康人脸库(0.否，1.是)
-    */
+     * 是否添加到海康人脸库(0.否，1.是)
+     */
     private Integer inFaceHk;
     /**
-    * 人脸的唯一标识
-    */
+     * 人脸的唯一标识
+     */
     private String indexCode;
     /**
-    * 人脸所属的人脸分组的唯一标识
-    */
+     * 人脸所属的人脸分组的唯一标识
+     */
     private String ifaceGroupIndexCode;
 
 
 
     public PersonEntity(){}
     /**
-    * 获取 站点Id
-    * @return Long
-    */
+     * 获取 站点Id
+     * @return Long
+     */
     public Long getSiteId(){
         return siteId;
     }
     /**
-    * 设置 站点Id
-    * @param siteId
-    */
+     * 设置 站点Id
+     * @param siteId
+     */
     public void setSiteId(Long siteId){
         this.siteId = siteId;
     }
     /**
-    * 获取 站点名称
-    * @return String
-    */
+     * 获取 站点名称
+     * @return String
+     */
     public String getSiteName(){
         return siteName;
     }
     /**
-    * 设置 站点名称
-    * @param siteName
-    */
+     * 设置 站点名称
+     * @param siteName
+     */
     public void setSiteName(String siteName){
         this.siteName = siteName;
     }
     /**
-    * 获取 用户名称
-    * @return String
-    */
+     * 获取 用户名称
+     * @return String
+     */
     public String getName(){
         return name;
     }
     /**
-    * 设置 用户名称
-    * @param name
-    */
+     * 设置 用户名称
+     * @param name
+     */
     public void setName(String name){
         this.name = name;
     }
     /**
-    * 获取 身份证号码
-    * @return String
-    */
+     * 获取 身份证号码
+     * @return String
+     */
     public String getIdCard(){
         return idCard;
     }
     /**
-    * 设置 身份证号码
-    * @param idCard
-    */
+     * 设置 身份证号码
+     * @param idCard
+     */
     public void setIdCard(String idCard){
         this.idCard = idCard;
     }
     /**
-    * 获取 性别(0.男,1.女)
-    * @return Integer
-    */
+     * 获取 性别(0.男,1.女)
+     * @return Integer
+     */
     public Integer getGender(){
         return gender;
     }
     /**
-    * 设置 性别(0.男,1.女)
-    * @param gender
-    */
+     * 设置 性别(0.男,1.女)
+     * @param gender
+     */
     public void setGender(Integer gender){
         this.gender = gender;
     }
     /**
-    * 获取 手机号码
-    * @return String
-    */
+     * 获取 手机号码
+     * @return String
+     */
     public String getPhone(){
         return phone;
     }
     /**
-    * 设置 手机号码
-    * @param phone
-    */
+     * 设置 手机号码
+     * @param phone
+     */
     public void setPhone(String phone){
         this.phone = phone;
     }
     /**
-    * 获取 出生日期
-    * @return Date
-    */
+     * 获取 出生日期
+     * @return Date
+     */
     public Date getBirthday(){
         return birthday;
     }
     /**
-    * 设置 出生日期
-    * @param birthday
-    */
+     * 设置 出生日期
+     * @param birthday
+     */
     public void setBirthday(Date birthday){
         this.birthday = birthday;
     }
     /**
-    * 获取 家庭住址
-    * @return String
-    */
+     * 获取 家庭住址
+     * @return String
+     */
     public String getAddress(){
         return address;
     }
     /**
-    * 设置 家庭住址
-    * @param address
-    */
+     * 设置 家庭住址
+     * @param address
+     */
     public void setAddress(String address){
         this.address = address;
     }
     /**
-    * 获取 照片路径
-    * @return String
-    */
+     * 获取 本地照片路径
+     * @return String
+     */
     public String getPhoto(){
         return photo;
     }
     /**
-    * 设置 照片路径
-    * @param photo
-    */
+     * 设置 本地照片路径
+     * @param photo
+     */
     public void setPhoto(String photo){
         this.photo = photo;
     }
     /**
-    * 获取 备注
-    * @return String
-    */
+     * 获取 原始照片路径
+     * @return String
+     */
+    public String getSourcePhotoUri(){
+        return sourcePhotoUri;
+    }
+    /**
+     * 设置 原始照片路径
+     * @param sourcePhotoUri
+     */
+    public void setSourcePhotoUri(String sourcePhotoUri){
+        this.sourcePhotoUri = sourcePhotoUri;
+    }
+    /**
+     * 获取 Php原始注册用户id
+     * @return Long
+     */
+    public Long getSourceId(){
+        return sourceId;
+    }
+    /**
+     * 设置 Php原始注册用户id
+     * @param sourceId
+     */
+    public void setSourceId(Long sourceId){
+        this.sourceId = sourceId;
+    }
+    /**
+     * 获取 备注
+     * @return String
+     */
     public String getRemark(){
         return remark;
     }
     /**
-    * 设置 备注
-    * @param remark
-    */
+     * 设置 备注
+     * @param remark
+     */
     public void setRemark(String remark){
         this.remark = remark;
     }
     /**
-    * 获取 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @return Integer
-    */
+     * 获取 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @return Integer
+     */
     public Integer getSource(){
         return source;
     }
     /**
-    * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param source
-    */
+     * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param source
+     */
     public void setSource(Integer source){
         this.source = source;
     }
     /**
-    * 获取 是否添加到海康人脸库(0.否，1.是)
-    * @return Integer
-    */
+     * 获取 是否添加到海康人脸库(0.否，1.是)
+     * @return Integer
+     */
     public Integer getInFaceHk(){
         return inFaceHk;
     }
     /**
-    * 设置 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHk
-    */
+     * 设置 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHk
+     */
     public void setInFaceHk(Integer inFaceHk){
         this.inFaceHk = inFaceHk;
     }
     /**
-    * 获取 人脸的唯一标识
-    * @return String
-    */
+     * 获取 人脸的唯一标识
+     * @return String
+     */
     public String getIndexCode(){
         return indexCode;
     }
     /**
-    * 设置 人脸的唯一标识
-    * @param indexCode
-    */
+     * 设置 人脸的唯一标识
+     * @param indexCode
+     */
     public void setIndexCode(String indexCode){
         this.indexCode = indexCode;
     }
     /**
-    * 获取 人脸所属的人脸分组的唯一标识
-    * @return String
-    */
+     * 获取 人脸所属的人脸分组的唯一标识
+     * @return String
+     */
     public String getIfaceGroupIndexCode(){
         return ifaceGroupIndexCode;
     }
     /**
-    * 设置 人脸所属的人脸分组的唯一标识
-    * @param ifaceGroupIndexCode
-    */
+     * 设置 人脸所属的人脸分组的唯一标识
+     * @param ifaceGroupIndexCode
+     */
     public void setIfaceGroupIndexCode(String ifaceGroupIndexCode){
         this.ifaceGroupIndexCode = ifaceGroupIndexCode;
     }
@@ -282,7 +318,7 @@ public class PersonEntity extends PersonVo {
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -290,7 +326,7 @@ public class PersonEntity extends PersonVo {
         if (obj instanceof PersonEntity) {
             PersonEntity tmp = (PersonEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -307,6 +343,8 @@ public class PersonEntity extends PersonVo {
         sb.append(",birthday:").append(getBirthday());
         sb.append(",address:").append(getAddress());
         sb.append(",photo:").append(getPhoto());
+        sb.append(",sourcePhotoUri:").append(getSourcePhotoUri());
+        sb.append(",sourceId:").append(getSourceId());
         sb.append(",remark:").append(getRemark());
         sb.append(",source:").append(getSource());
         sb.append(",inFaceHk:").append(getInFaceHk());
@@ -317,32 +355,36 @@ public class PersonEntity extends PersonVo {
 
     public void initAttrValue(){
 
-            this.siteId = null;
+        this.siteId = null;
+
+        this.siteName = "";
+
+        this.name = "";
 
-            this.siteName = "";
+        this.idCard = "";
 
-            this.name = "";
+        this.gender = 0;
 
-            this.idCard = "";
+        this.phone = "";
 
-            this.gender = 0;
+        this.birthday = null;
 
-            this.phone = "";
+        this.address = "";
 
-            this.birthday = null;
+        this.photo = "";
 
-            this.address = "";
+        this.sourcePhotoUri = "";
 
-            this.photo = "";
+        this.sourceId = null;
 
-            this.remark = "";
+        this.remark = "";
 
-            this.source = null;
+        this.source = 0;
 
-            this.inFaceHk = 0;
+        this.inFaceHk = 0;
 
-            this.indexCode = "";
+        this.indexCode = "";
 
-            this.ifaceGroupIndexCode = "";
+        this.ifaceGroupIndexCode = "";
     }
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/person/model/PersonQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.person.model.PersonEntity;
 /**
-* 注册人员查询对象
-*
-* @author zxfei
-* @date 2023-04-09
-*/
+ * 注册人员查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
 public class PersonQuery extends PersonEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -86,11 +86,31 @@ public class PersonQuery extends PersonEntity {
 
     /** 家庭住址排除列表 */
     private List <String> addressNotList;
-    /** 照片路径 */
+    /** 本地照片路径 */
     private List<String> photoList;
 
-    /** 照片路径排除列表 */
+    /** 本地照片路径排除列表 */
     private List <String> photoNotList;
+    /** 原始照片路径 */
+    private List<String> sourcePhotoUriList;
+
+    /** 原始照片路径排除列表 */
+    private List <String> sourcePhotoUriNotList;
+    /** 开始 Php原始注册用户id */
+    private Long sourceIdStart;
+
+    /** 结束 Php原始注册用户id */
+    private Long sourceIdEnd;
+
+    /** 增加 Php原始注册用户id */
+    private Long sourceIdIncrement;
+
+    /** Php原始注册用户id列表 */
+    private List <Long> sourceIdList;
+
+    /** Php原始注册用户id排除列表 */
+    private List <Long> sourceIdNotList;
+
     /** 备注 */
     private List<String> remarkList;
 
@@ -187,1536 +207,1722 @@ public class PersonQuery extends PersonEntity {
     public PersonQuery(){}
 
     /**
-    * 获取 开始 主键ID，主键，自增长
-    * @return idStart
-    */
+     * 获取 开始 主键ID，主键，自增长
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 设置 开始 主键ID，主键，自增长
-    * @param idStart
-    */
+     * 设置 开始 主键ID，主键，自增长
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 获取 结束 主键ID，主键，自增长
-    * @return $idEnd
-    */
+     * 获取 结束 主键ID，主键，自增长
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 设置 结束 主键ID，主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键ID，主键，自增长
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 获取 增加 主键ID，主键，自增长
-    * @return idIncrement
-    */
+     * 获取 增加 主键ID，主键，自增长
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 设置 增加 主键ID，主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键ID，主键，自增长
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 获取 主键ID，主键，自增长
-    * @return idList
-    */
+     * 获取 主键ID，主键，自增长
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 设置 主键ID，主键，自增长
-    * @param idList
-    */
+     * 设置 主键ID，主键，自增长
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 获取 主键ID，主键，自增长
-    * @return idNotList
-    */
+     * 获取 主键ID，主键，自增长
+     * @return idNotList
+     */
     public List<Long> getIdNotList(){
         return this.idNotList;
     }
 
     /**
-    * 设置 主键ID，主键，自增长
-    * @param idNotList
-    */
+     * 设置 主键ID，主键，自增长
+     * @param idNotList
+     */
     public void setIdNotList(List<Long> idNotList){
         this.idNotList = idNotList;
     }
 
 
     /**
-    * 获取 开始 站点Id
-    * @return siteIdStart
-    */
+     * 获取 开始 站点Id
+     * @return siteIdStart
+     */
     public Long getSiteIdStart(){
         return this.siteIdStart;
     }
 
     /**
-    * 设置 开始 站点Id
-    * @param siteIdStart
-    */
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
     public void setSiteIdStart(Long siteIdStart){
         this.siteIdStart = siteIdStart;
     }
 
     /**
-    * 获取 结束 站点Id
-    * @return $siteIdEnd
-    */
+     * 获取 结束 站点Id
+     * @return $siteIdEnd
+     */
     public Long getSiteIdEnd(){
         return this.siteIdEnd;
     }
 
     /**
-    * 设置 结束 站点Id
-    * @param siteIdEnd
-    */
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
     public void setSiteIdEnd(Long siteIdEnd){
         this.siteIdEnd = siteIdEnd;
     }
 
     /**
-    * 获取 增加 站点Id
-    * @return siteIdIncrement
-    */
+     * 获取 增加 站点Id
+     * @return siteIdIncrement
+     */
     public Long getSiteIdIncrement(){
         return this.siteIdIncrement;
     }
 
     /**
-    * 设置 增加 站点Id
-    * @param siteIdIncrement
-    */
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
     public void setSiteIdIncrement(Long siteIdIncrement){
         this.siteIdIncrement = siteIdIncrement;
     }
 
     /**
-    * 获取 站点Id
-    * @return siteIdList
-    */
+     * 获取 站点Id
+     * @return siteIdList
+     */
     public List<Long> getSiteIdList(){
         return this.siteIdList;
     }
 
     /**
-    * 设置 站点Id
-    * @param siteIdList
-    */
+     * 设置 站点Id
+     * @param siteIdList
+     */
     public void setSiteIdList(List<Long> siteIdList){
         this.siteIdList = siteIdList;
     }
 
     /**
-    * 获取 站点Id
-    * @return siteIdNotList
-    */
+     * 获取 站点Id
+     * @return siteIdNotList
+     */
     public List<Long> getSiteIdNotList(){
         return this.siteIdNotList;
     }
 
     /**
-    * 设置 站点Id
-    * @param siteIdNotList
-    */
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
     public void setSiteIdNotList(List<Long> siteIdNotList){
         this.siteIdNotList = siteIdNotList;
     }
 
 
     /**
-    * 获取 站点名称
-    * @return siteNameList
-    */
+     * 获取 站点名称
+     * @return siteNameList
+     */
     public List<String> getSiteNameList(){
         return this.siteNameList;
     }
 
     /**
-    * 设置 站点名称
-    * @param siteNameList
-    */
+     * 设置 站点名称
+     * @param siteNameList
+     */
     public void setSiteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
     }
 
     /**
-    * 获取 站点名称
-    * @return siteNameNotList
-    */
+     * 获取 站点名称
+     * @return siteNameNotList
+     */
     public List<String> getSiteNameNotList(){
         return this.siteNameNotList;
     }
 
     /**
-    * 设置 站点名称
-    * @param siteNameNotList
-    */
+     * 设置 站点名称
+     * @param siteNameNotList
+     */
     public void setSiteNameNotList(List<String> siteNameNotList){
         this.siteNameNotList = siteNameNotList;
     }
 
     /**
-    * 获取 用户名称
-    * @return nameList
-    */
+     * 获取 用户名称
+     * @return nameList
+     */
     public List<String> getNameList(){
         return this.nameList;
     }
 
     /**
-    * 设置 用户名称
-    * @param nameList
-    */
+     * 设置 用户名称
+     * @param nameList
+     */
     public void setNameList(List<String> nameList){
         this.nameList = nameList;
     }
 
     /**
-    * 获取 用户名称
-    * @return nameNotList
-    */
+     * 获取 用户名称
+     * @return nameNotList
+     */
     public List<String> getNameNotList(){
         return this.nameNotList;
     }
 
     /**
-    * 设置 用户名称
-    * @param nameNotList
-    */
+     * 设置 用户名称
+     * @param nameNotList
+     */
     public void setNameNotList(List<String> nameNotList){
         this.nameNotList = nameNotList;
     }
 
     /**
-    * 获取 身份证号码
-    * @return idCardList
-    */
+     * 获取 身份证号码
+     * @return idCardList
+     */
     public List<String> getIdCardList(){
         return this.idCardList;
     }
 
     /**
-    * 设置 身份证号码
-    * @param idCardList
-    */
+     * 设置 身份证号码
+     * @param idCardList
+     */
     public void setIdCardList(List<String> idCardList){
         this.idCardList = idCardList;
     }
 
     /**
-    * 获取 身份证号码
-    * @return idCardNotList
-    */
+     * 获取 身份证号码
+     * @return idCardNotList
+     */
     public List<String> getIdCardNotList(){
         return this.idCardNotList;
     }
 
     /**
-    * 设置 身份证号码
-    * @param idCardNotList
-    */
+     * 设置 身份证号码
+     * @param idCardNotList
+     */
     public void setIdCardNotList(List<String> idCardNotList){
         this.idCardNotList = idCardNotList;
     }
 
     /**
-    * 获取 开始 性别(0.男,1.女)
-    * @return genderStart
-    */
+     * 获取 开始 性别(0.男,1.女)
+     * @return genderStart
+     */
     public Integer getGenderStart(){
         return this.genderStart;
     }
 
     /**
-    * 设置 开始 性别(0.男,1.女)
-    * @param genderStart
-    */
+     * 设置 开始 性别(0.男,1.女)
+     * @param genderStart
+     */
     public void setGenderStart(Integer genderStart){
         this.genderStart = genderStart;
     }
 
     /**
-    * 获取 结束 性别(0.男,1.女)
-    * @return $genderEnd
-    */
+     * 获取 结束 性别(0.男,1.女)
+     * @return $genderEnd
+     */
     public Integer getGenderEnd(){
         return this.genderEnd;
     }
 
     /**
-    * 设置 结束 性别(0.男,1.女)
-    * @param genderEnd
-    */
+     * 设置 结束 性别(0.男,1.女)
+     * @param genderEnd
+     */
     public void setGenderEnd(Integer genderEnd){
         this.genderEnd = genderEnd;
     }
 
     /**
-    * 获取 增加 性别(0.男,1.女)
-    * @return genderIncrement
-    */
+     * 获取 增加 性别(0.男,1.女)
+     * @return genderIncrement
+     */
     public Integer getGenderIncrement(){
         return this.genderIncrement;
     }
 
     /**
-    * 设置 增加 性别(0.男,1.女)
-    * @param genderIncrement
-    */
+     * 设置 增加 性别(0.男,1.女)
+     * @param genderIncrement
+     */
     public void setGenderIncrement(Integer genderIncrement){
         this.genderIncrement = genderIncrement;
     }
 
     /**
-    * 获取 性别(0.男,1.女)
-    * @return genderList
-    */
+     * 获取 性别(0.男,1.女)
+     * @return genderList
+     */
     public List<Integer> getGenderList(){
         return this.genderList;
     }
 
     /**
-    * 设置 性别(0.男,1.女)
-    * @param genderList
-    */
+     * 设置 性别(0.男,1.女)
+     * @param genderList
+     */
     public void setGenderList(List<Integer> genderList){
         this.genderList = genderList;
     }
 
     /**
-    * 获取 性别(0.男,1.女)
-    * @return genderNotList
-    */
+     * 获取 性别(0.男,1.女)
+     * @return genderNotList
+     */
     public List<Integer> getGenderNotList(){
         return this.genderNotList;
     }
 
     /**
-    * 设置 性别(0.男,1.女)
-    * @param genderNotList
-    */
+     * 设置 性别(0.男,1.女)
+     * @param genderNotList
+     */
     public void setGenderNotList(List<Integer> genderNotList){
         this.genderNotList = genderNotList;
     }
 
 
     /**
-    * 获取 手机号码
-    * @return phoneList
-    */
+     * 获取 手机号码
+     * @return phoneList
+     */
     public List<String> getPhoneList(){
         return this.phoneList;
     }
 
     /**
-    * 设置 手机号码
-    * @param phoneList
-    */
+     * 设置 手机号码
+     * @param phoneList
+     */
     public void setPhoneList(List<String> phoneList){
         this.phoneList = phoneList;
     }
 
     /**
-    * 获取 手机号码
-    * @return phoneNotList
-    */
+     * 获取 手机号码
+     * @return phoneNotList
+     */
     public List<String> getPhoneNotList(){
         return this.phoneNotList;
     }
 
     /**
-    * 设置 手机号码
-    * @param phoneNotList
-    */
+     * 设置 手机号码
+     * @param phoneNotList
+     */
     public void setPhoneNotList(List<String> phoneNotList){
         this.phoneNotList = phoneNotList;
     }
 
     /**
-    * 获取 开始 出生日期
-    * @return birthdayStart
-    */
+     * 获取 开始 出生日期
+     * @return birthdayStart
+     */
     public String getBirthdayStart(){
         return this.birthdayStart;
     }
 
     /**
-    * 设置 开始 出生日期
-    * @param birthdayStart
-    */
+     * 设置 开始 出生日期
+     * @param birthdayStart
+     */
     public void setBirthdayStart(String birthdayStart){
         this.birthdayStart = birthdayStart;
     }
 
     /**
-    * 获取 结束 出生日期
-    * @return birthdayEnd
-    */
+     * 获取 结束 出生日期
+     * @return birthdayEnd
+     */
     public String getBirthdayEnd(){
         return this.birthdayEnd;
     }
 
     /**
-    * 设置 结束 出生日期
-    * @param birthdayEnd
-    */
+     * 设置 结束 出生日期
+     * @param birthdayEnd
+     */
     public void setBirthdayEnd(String birthdayEnd){
         this.birthdayEnd = birthdayEnd;
     }
 
     /**
-    * 获取 家庭住址
-    * @return addressList
-    */
+     * 获取 家庭住址
+     * @return addressList
+     */
     public List<String> getAddressList(){
         return this.addressList;
     }
 
     /**
-    * 设置 家庭住址
-    * @param addressList
-    */
+     * 设置 家庭住址
+     * @param addressList
+     */
     public void setAddressList(List<String> addressList){
         this.addressList = addressList;
     }
 
     /**
-    * 获取 家庭住址
-    * @return addressNotList
-    */
+     * 获取 家庭住址
+     * @return addressNotList
+     */
     public List<String> getAddressNotList(){
         return this.addressNotList;
     }
 
     /**
-    * 设置 家庭住址
-    * @param addressNotList
-    */
+     * 设置 家庭住址
+     * @param addressNotList
+     */
     public void setAddressNotList(List<String> addressNotList){
         this.addressNotList = addressNotList;
     }
 
     /**
-    * 获取 照片路径
-    * @return photoList
-    */
+     * 获取 本地照片路径
+     * @return photoList
+     */
     public List<String> getPhotoList(){
         return this.photoList;
     }
 
     /**
-    * 设置 照片路径
-    * @param photoList
-    */
+     * 设置 本地照片路径
+     * @param photoList
+     */
     public void setPhotoList(List<String> photoList){
         this.photoList = photoList;
     }
 
     /**
-    * 获取 照片路径
-    * @return photoNotList
-    */
+     * 获取 本地照片路径
+     * @return photoNotList
+     */
     public List<String> getPhotoNotList(){
         return this.photoNotList;
     }
 
     /**
-    * 设置 照片路径
-    * @param photoNotList
-    */
+     * 设置 本地照片路径
+     * @param photoNotList
+     */
     public void setPhotoNotList(List<String> photoNotList){
         this.photoNotList = photoNotList;
     }
 
     /**
-    * 获取 备注
-    * @return remarkList
-    */
+     * 获取 原始照片路径
+     * @return sourcePhotoUriList
+     */
+    public List<String> getSourcePhotoUriList(){
+        return this.sourcePhotoUriList;
+    }
+
+    /**
+     * 设置 原始照片路径
+     * @param sourcePhotoUriList
+     */
+    public void setSourcePhotoUriList(List<String> sourcePhotoUriList){
+        this.sourcePhotoUriList = sourcePhotoUriList;
+    }
+
+    /**
+     * 获取 原始照片路径
+     * @return sourcePhotoUriNotList
+     */
+    public List<String> getSourcePhotoUriNotList(){
+        return this.sourcePhotoUriNotList;
+    }
+
+    /**
+     * 设置 原始照片路径
+     * @param sourcePhotoUriNotList
+     */
+    public void setSourcePhotoUriNotList(List<String> sourcePhotoUriNotList){
+        this.sourcePhotoUriNotList = sourcePhotoUriNotList;
+    }
+
+    /**
+     * 获取 开始 Php原始注册用户id
+     * @return sourceIdStart
+     */
+    public Long getSourceIdStart(){
+        return this.sourceIdStart;
+    }
+
+    /**
+     * 设置 开始 Php原始注册用户id
+     * @param sourceIdStart
+     */
+    public void setSourceIdStart(Long sourceIdStart){
+        this.sourceIdStart = sourceIdStart;
+    }
+
+    /**
+     * 获取 结束 Php原始注册用户id
+     * @return $sourceIdEnd
+     */
+    public Long getSourceIdEnd(){
+        return this.sourceIdEnd;
+    }
+
+    /**
+     * 设置 结束 Php原始注册用户id
+     * @param sourceIdEnd
+     */
+    public void setSourceIdEnd(Long sourceIdEnd){
+        this.sourceIdEnd = sourceIdEnd;
+    }
+
+    /**
+     * 获取 增加 Php原始注册用户id
+     * @return sourceIdIncrement
+     */
+    public Long getSourceIdIncrement(){
+        return this.sourceIdIncrement;
+    }
+
+    /**
+     * 设置 增加 Php原始注册用户id
+     * @param sourceIdIncrement
+     */
+    public void setSourceIdIncrement(Long sourceIdIncrement){
+        this.sourceIdIncrement = sourceIdIncrement;
+    }
+
+    /**
+     * 获取 Php原始注册用户id
+     * @return sourceIdList
+     */
+    public List<Long> getSourceIdList(){
+        return this.sourceIdList;
+    }
+
+    /**
+     * 设置 Php原始注册用户id
+     * @param sourceIdList
+     */
+    public void setSourceIdList(List<Long> sourceIdList){
+        this.sourceIdList = sourceIdList;
+    }
+
+    /**
+     * 获取 Php原始注册用户id
+     * @return sourceIdNotList
+     */
+    public List<Long> getSourceIdNotList(){
+        return this.sourceIdNotList;
+    }
+
+    /**
+     * 设置 Php原始注册用户id
+     * @param sourceIdNotList
+     */
+    public void setSourceIdNotList(List<Long> sourceIdNotList){
+        this.sourceIdNotList = sourceIdNotList;
+    }
+
+
+    /**
+     * 获取 备注
+     * @return remarkList
+     */
     public List<String> getRemarkList(){
         return this.remarkList;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
-    */
+     * 设置 备注
+     * @param remarkList
+     */
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
 
     /**
-    * 获取 备注
-    * @return remarkNotList
-    */
+     * 获取 备注
+     * @return remarkNotList
+     */
     public List<String> getRemarkNotList(){
         return this.remarkNotList;
     }
 
     /**
-    * 设置 备注
-    * @param remarkNotList
-    */
+     * 设置 备注
+     * @param remarkNotList
+     */
     public void setRemarkNotList(List<String> remarkNotList){
         this.remarkNotList = remarkNotList;
     }
 
     /**
-    * 获取 开始 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @return sourceStart
-    */
+     * 获取 开始 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @return sourceStart
+     */
     public Integer getSourceStart(){
         return this.sourceStart;
     }
 
     /**
-    * 设置 开始 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceStart
-    */
+     * 设置 开始 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceStart
+     */
     public void setSourceStart(Integer sourceStart){
         this.sourceStart = sourceStart;
     }
 
     /**
-    * 获取 结束 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @return $sourceEnd
-    */
+     * 获取 结束 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @return $sourceEnd
+     */
     public Integer getSourceEnd(){
         return this.sourceEnd;
     }
 
     /**
-    * 设置 结束 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceEnd
-    */
+     * 设置 结束 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceEnd
+     */
     public void setSourceEnd(Integer sourceEnd){
         this.sourceEnd = sourceEnd;
     }
 
     /**
-    * 获取 增加 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @return sourceIncrement
-    */
+     * 获取 增加 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @return sourceIncrement
+     */
     public Integer getSourceIncrement(){
         return this.sourceIncrement;
     }
 
     /**
-    * 设置 增加 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceIncrement
-    */
+     * 设置 增加 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceIncrement
+     */
     public void setSourceIncrement(Integer sourceIncrement){
         this.sourceIncrement = sourceIncrement;
     }
 
     /**
-    * 获取 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @return sourceList
-    */
+     * 获取 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @return sourceList
+     */
     public List<Integer> getSourceList(){
         return this.sourceList;
     }
 
     /**
-    * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceList
-    */
+     * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceList
+     */
     public void setSourceList(List<Integer> sourceList){
         this.sourceList = sourceList;
     }
 
     /**
-    * 获取 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @return sourceNotList
-    */
+     * 获取 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @return sourceNotList
+     */
     public List<Integer> getSourceNotList(){
         return this.sourceNotList;
     }
 
     /**
-    * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceNotList
-    */
+     * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceNotList
+     */
     public void setSourceNotList(List<Integer> sourceNotList){
         this.sourceNotList = sourceNotList;
     }
 
 
     /**
-    * 获取 开始 是否添加到海康人脸库(0.否，1.是)
-    * @return inFaceHkStart
-    */
+     * 获取 开始 是否添加到海康人脸库(0.否，1.是)
+     * @return inFaceHkStart
+     */
     public Integer getInFaceHkStart(){
         return this.inFaceHkStart;
     }
 
     /**
-    * 设置 开始 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkStart
-    */
+     * 设置 开始 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkStart
+     */
     public void setInFaceHkStart(Integer inFaceHkStart){
         this.inFaceHkStart = inFaceHkStart;
     }
 
     /**
-    * 获取 结束 是否添加到海康人脸库(0.否，1.是)
-    * @return $inFaceHkEnd
-    */
+     * 获取 结束 是否添加到海康人脸库(0.否，1.是)
+     * @return $inFaceHkEnd
+     */
     public Integer getInFaceHkEnd(){
         return this.inFaceHkEnd;
     }
 
     /**
-    * 设置 结束 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkEnd
-    */
+     * 设置 结束 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkEnd
+     */
     public void setInFaceHkEnd(Integer inFaceHkEnd){
         this.inFaceHkEnd = inFaceHkEnd;
     }
 
     /**
-    * 获取 增加 是否添加到海康人脸库(0.否，1.是)
-    * @return inFaceHkIncrement
-    */
+     * 获取 增加 是否添加到海康人脸库(0.否，1.是)
+     * @return inFaceHkIncrement
+     */
     public Integer getInFaceHkIncrement(){
         return this.inFaceHkIncrement;
     }
 
     /**
-    * 设置 增加 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkIncrement
-    */
+     * 设置 增加 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkIncrement
+     */
     public void setInFaceHkIncrement(Integer inFaceHkIncrement){
         this.inFaceHkIncrement = inFaceHkIncrement;
     }
 
     /**
-    * 获取 是否添加到海康人脸库(0.否，1.是)
-    * @return inFaceHkList
-    */
+     * 获取 是否添加到海康人脸库(0.否，1.是)
+     * @return inFaceHkList
+     */
     public List<Integer> getInFaceHkList(){
         return this.inFaceHkList;
     }
 
     /**
-    * 设置 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkList
-    */
+     * 设置 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkList
+     */
     public void setInFaceHkList(List<Integer> inFaceHkList){
         this.inFaceHkList = inFaceHkList;
     }
 
     /**
-    * 获取 是否添加到海康人脸库(0.否，1.是)
-    * @return inFaceHkNotList
-    */
+     * 获取 是否添加到海康人脸库(0.否，1.是)
+     * @return inFaceHkNotList
+     */
     public List<Integer> getInFaceHkNotList(){
         return this.inFaceHkNotList;
     }
 
     /**
-    * 设置 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkNotList
-    */
+     * 设置 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkNotList
+     */
     public void setInFaceHkNotList(List<Integer> inFaceHkNotList){
         this.inFaceHkNotList = inFaceHkNotList;
     }
 
 
     /**
-    * 获取 人脸的唯一标识
-    * @return indexCodeList
-    */
+     * 获取 人脸的唯一标识
+     * @return indexCodeList
+     */
     public List<String> getIndexCodeList(){
         return this.indexCodeList;
     }
 
     /**
-    * 设置 人脸的唯一标识
-    * @param indexCodeList
-    */
+     * 设置 人脸的唯一标识
+     * @param indexCodeList
+     */
     public void setIndexCodeList(List<String> indexCodeList){
         this.indexCodeList = indexCodeList;
     }
 
     /**
-    * 获取 人脸的唯一标识
-    * @return indexCodeNotList
-    */
+     * 获取 人脸的唯一标识
+     * @return indexCodeNotList
+     */
     public List<String> getIndexCodeNotList(){
         return this.indexCodeNotList;
     }
 
     /**
-    * 设置 人脸的唯一标识
-    * @param indexCodeNotList
-    */
+     * 设置 人脸的唯一标识
+     * @param indexCodeNotList
+     */
     public void setIndexCodeNotList(List<String> indexCodeNotList){
         this.indexCodeNotList = indexCodeNotList;
     }
 
     /**
-    * 获取 人脸所属的人脸分组的唯一标识
-    * @return ifaceGroupIndexCodeList
-    */
+     * 获取 人脸所属的人脸分组的唯一标识
+     * @return ifaceGroupIndexCodeList
+     */
     public List<String> getIfaceGroupIndexCodeList(){
         return this.ifaceGroupIndexCodeList;
     }
 
     /**
-    * 设置 人脸所属的人脸分组的唯一标识
-    * @param ifaceGroupIndexCodeList
-    */
+     * 设置 人脸所属的人脸分组的唯一标识
+     * @param ifaceGroupIndexCodeList
+     */
     public void setIfaceGroupIndexCodeList(List<String> ifaceGroupIndexCodeList){
         this.ifaceGroupIndexCodeList = ifaceGroupIndexCodeList;
     }
 
     /**
-    * 获取 人脸所属的人脸分组的唯一标识
-    * @return ifaceGroupIndexCodeNotList
-    */
+     * 获取 人脸所属的人脸分组的唯一标识
+     * @return ifaceGroupIndexCodeNotList
+     */
     public List<String> getIfaceGroupIndexCodeNotList(){
         return this.ifaceGroupIndexCodeNotList;
     }
 
     /**
-    * 设置 人脸所属的人脸分组的唯一标识
-    * @param ifaceGroupIndexCodeNotList
-    */
+     * 设置 人脸所属的人脸分组的唯一标识
+     * @param ifaceGroupIndexCodeNotList
+     */
     public void setIfaceGroupIndexCodeNotList(List<String> ifaceGroupIndexCodeNotList){
         this.ifaceGroupIndexCodeNotList = ifaceGroupIndexCodeNotList;
     }
 
     /**
-    * 获取 开始 创建用户
-    * @return createUserIdStart
-    */
+     * 获取 开始 创建用户
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 获取 结束 创建用户
-    * @return $createUserIdEnd
-    */
+     * 获取 结束 创建用户
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 获取 增加 创建用户
-    * @return createUserIdIncrement
-    */
+     * 获取 增加 创建用户
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 获取 创建用户
-    * @return createUserIdList
-    */
+     * 获取 创建用户
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 获取 创建用户
-    * @return createUserIdNotList
-    */
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
     public List<Long> getCreateUserIdNotList(){
         return this.createUserIdNotList;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdNotList
-    */
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
     }
 
 
     /**
-    * 获取 开始 创建时间
-    * @return createTimeStart
-    */
+     * 获取 开始 创建时间
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 设置 开始 创建时间
-    * @param createTimeStart
-    */
+     * 设置 开始 创建时间
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 获取 结束 创建时间
-    * @return createTimeEnd
-    */
+     * 获取 结束 创建时间
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 设置 结束 创建时间
-    * @param createTimeEnd
-    */
+     * 设置 结束 创建时间
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 获取 开始 更新用户
-    * @return updateUserIdStart
-    */
+     * 获取 开始 更新用户
+     * @return updateUserIdStart
+     */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 获取 结束 更新用户
-    * @return $updateUserIdEnd
-    */
+     * 获取 结束 更新用户
+     * @return $updateUserIdEnd
+     */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 获取 增加 更新用户
-    * @return updateUserIdIncrement
-    */
+     * 获取 增加 更新用户
+     * @return updateUserIdIncrement
+     */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdList
-    */
+     * 获取 更新用户
+     * @return updateUserIdList
+     */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 获取 更新用户
-    * @return updateUserIdNotList
-    */
+     * 获取 更新用户
+     * @return updateUserIdNotList
+     */
     public List<Long> getUpdateUserIdNotList(){
         return this.updateUserIdNotList;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdNotList
-    */
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
     public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
     /**
-    * 获取 开始 更新时间
-    * @return updateTimeStart
-    */
+     * 获取 开始 更新时间
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 设置 开始 更新时间
-    * @param updateTimeStart
-    */
+     * 设置 开始 更新时间
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 获取 结束 更新时间
-    * @return updateTimeEnd
-    */
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 设置 结束 更新时间
-    * @param updateTimeEnd
-    */
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 设置  主键ID，主键，自增长
-    * @param id
-    */
+     * 设置  主键ID，主键，自增长
+     * @param id
+     */
     public PersonQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 主键ID，主键，自增长
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 主键ID，主键，自增长
+     * @param idStart
+     */
     public PersonQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 设置 结束 主键ID，主键，自增长
-    * @param idEnd
-    */
+     * 设置 结束 主键ID，主键，自增长
+     * @param idEnd
+     */
     public PersonQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 主键ID，主键，自增长
-    * @param idIncrement
-    */
+     * 设置 增加 主键ID，主键，自增长
+     * @param idIncrement
+     */
     public PersonQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 设置 主键ID，主键，自增长
-    * @param idList
-    */
+     * 设置 主键ID，主键，自增长
+     * @param idList
+     */
     public PersonQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
-
-        /**
-        * 设置 主键ID，主键，自增长
-        * @param idNotList
-        */
-        public PersonQuery idNotList(List<Long> idNotList){
+        return this;
+    }
+
+    /**
+     * 设置 主键ID，主键，自增长
+     * @param idNotList
+     */
+    public PersonQuery idNotList(List<Long> idNotList){
         this.idNotList = idNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  站点Id
-    * @param siteId
-    */
+     * 设置  站点Id
+     * @param siteId
+     */
     public PersonQuery siteId(Long siteId){
-	    setSiteId(siteId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 站点Id
-    * @param siteIdStart
-    */
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
     public PersonQuery siteIdStart(Long siteIdStart){
-		this.siteIdStart = siteIdStart;
-		return this;
+        this.siteIdStart = siteIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 站点Id
-    * @param siteIdEnd
-    */
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
     public PersonQuery siteIdEnd(Long siteIdEnd){
-		this.siteIdEnd = siteIdEnd;
-		return this;
+        this.siteIdEnd = siteIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 站点Id
-    * @param siteIdIncrement
-    */
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
     public PersonQuery siteIdIncrement(Long siteIdIncrement){
-		this.siteIdIncrement = siteIdIncrement;
-		return this;
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 站点Id
-    * @param siteIdList
-    */
+     * 设置 站点Id
+     * @param siteIdList
+     */
     public PersonQuery siteIdList(List<Long> siteIdList){
         this.siteIdList = siteIdList;
-		return this;
-        }
-
-        /**
-        * 设置 站点Id
-        * @param siteIdNotList
-        */
-        public PersonQuery siteIdNotList(List<Long> siteIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public PersonQuery siteIdNotList(List<Long> siteIdNotList){
         this.siteIdNotList = siteIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 站点名称
-    * @param siteName
-    */
+    /**
+     * 设置 站点名称
+     * @param siteName
+     */
     public PersonQuery siteName(String siteName){
         setSiteName(siteName);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 站点名称
-    * @param siteNameList
-    */
+     * 设置 站点名称
+     * @param siteNameList
+     */
     public PersonQuery siteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 用户名称
-    * @param name
-    */
+    /**
+     * 设置 用户名称
+     * @param name
+     */
     public PersonQuery name(String name){
         setName(name);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 用户名称
-    * @param nameList
-    */
+     * 设置 用户名称
+     * @param nameList
+     */
     public PersonQuery nameList(List<String> nameList){
         this.nameList = nameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 身份证号码
-    * @param idCard
-    */
+    /**
+     * 设置 身份证号码
+     * @param idCard
+     */
     public PersonQuery idCard(String idCard){
         setIdCard(idCard);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 身份证号码
-    * @param idCardList
-    */
+     * 设置 身份证号码
+     * @param idCardList
+     */
     public PersonQuery idCardList(List<String> idCardList){
         this.idCardList = idCardList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  性别(0.男,1.女)
-    * @param gender
-    */
+     * 设置  性别(0.男,1.女)
+     * @param gender
+     */
     public PersonQuery gender(Integer gender){
-	    setGender(gender);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 性别(0.男,1.女)
-    * @param genderStart
-    */
+        setGender(gender);
+        return this;
+    }
+
+    /**
+     * 设置 开始 性别(0.男,1.女)
+     * @param genderStart
+     */
     public PersonQuery genderStart(Integer genderStart){
-		this.genderStart = genderStart;
-		return this;
+        this.genderStart = genderStart;
+        return this;
     }
 
     /**
-    * 设置 结束 性别(0.男,1.女)
-    * @param genderEnd
-    */
+     * 设置 结束 性别(0.男,1.女)
+     * @param genderEnd
+     */
     public PersonQuery genderEnd(Integer genderEnd){
-		this.genderEnd = genderEnd;
-		return this;
+        this.genderEnd = genderEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 性别(0.男,1.女)
-    * @param genderIncrement
-    */
+     * 设置 增加 性别(0.男,1.女)
+     * @param genderIncrement
+     */
     public PersonQuery genderIncrement(Integer genderIncrement){
-		this.genderIncrement = genderIncrement;
-		return this;
+        this.genderIncrement = genderIncrement;
+        return this;
     }
 
     /**
-    * 设置 性别(0.男,1.女)
-    * @param genderList
-    */
+     * 设置 性别(0.男,1.女)
+     * @param genderList
+     */
     public PersonQuery genderList(List<Integer> genderList){
         this.genderList = genderList;
-		return this;
-        }
-
-        /**
-        * 设置 性别(0.男,1.女)
-        * @param genderNotList
-        */
-        public PersonQuery genderNotList(List<Integer> genderNotList){
+        return this;
+    }
+
+    /**
+     * 设置 性别(0.男,1.女)
+     * @param genderNotList
+     */
+    public PersonQuery genderNotList(List<Integer> genderNotList){
         this.genderNotList = genderNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 手机号码
-    * @param phone
-    */
+    /**
+     * 设置 手机号码
+     * @param phone
+     */
     public PersonQuery phone(String phone){
         setPhone(phone);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 手机号码
-    * @param phoneList
-    */
+     * 设置 手机号码
+     * @param phoneList
+     */
     public PersonQuery phoneList(List<String> phoneList){
         this.phoneList = phoneList;
-		return this;
+        return this;
     }
 
 
 
-	/**
-    * 设置 家庭住址
-    * @param address
-    */
+    /**
+     * 设置 家庭住址
+     * @param address
+     */
     public PersonQuery address(String address){
         setAddress(address);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 家庭住址
-    * @param addressList
-    */
+     * 设置 家庭住址
+     * @param addressList
+     */
     public PersonQuery addressList(List<String> addressList){
         this.addressList = addressList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 照片路径
-    * @param photo
-    */
+    /**
+     * 设置 本地照片路径
+     * @param photo
+     */
     public PersonQuery photo(String photo){
         setPhoto(photo);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 照片路径
-    * @param photoList
-    */
+     * 设置 本地照片路径
+     * @param photoList
+     */
     public PersonQuery photoList(List<String> photoList){
         this.photoList = photoList;
-		return this;
+        return this;
+    }
+
+
+    /**
+     * 设置 原始照片路径
+     * @param sourcePhotoUri
+     */
+    public PersonQuery sourcePhotoUri(String sourcePhotoUri){
+        setSourcePhotoUri(sourcePhotoUri);
+        return this;
+    }
+
+    /**
+     * 设置 原始照片路径
+     * @param sourcePhotoUriList
+     */
+    public PersonQuery sourcePhotoUriList(List<String> sourcePhotoUriList){
+        this.sourcePhotoUriList = sourcePhotoUriList;
+        return this;
+    }
+
+    /**
+     * 设置  Php原始注册用户id
+     * @param sourceId
+     */
+    public PersonQuery sourceId(Long sourceId){
+        setSourceId(sourceId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 Php原始注册用户id
+     * @param sourceIdStart
+     */
+    public PersonQuery sourceIdStart(Long sourceIdStart){
+        this.sourceIdStart = sourceIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 Php原始注册用户id
+     * @param sourceIdEnd
+     */
+    public PersonQuery sourceIdEnd(Long sourceIdEnd){
+        this.sourceIdEnd = sourceIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 Php原始注册用户id
+     * @param sourceIdIncrement
+     */
+    public PersonQuery sourceIdIncrement(Long sourceIdIncrement){
+        this.sourceIdIncrement = sourceIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 Php原始注册用户id
+     * @param sourceIdList
+     */
+    public PersonQuery sourceIdList(List<Long> sourceIdList){
+        this.sourceIdList = sourceIdList;
+        return this;
+    }
+
+    /**
+     * 设置 Php原始注册用户id
+     * @param sourceIdNotList
+     */
+    public PersonQuery sourceIdNotList(List<Long> sourceIdNotList){
+        this.sourceIdNotList = sourceIdNotList;
+        return this;
     }
 
 
-	/**
-    * 设置 备注
-    * @param remark
-    */
+    /**
+     * 设置 备注
+     * @param remark
+     */
     public PersonQuery remark(String remark){
         setRemark(remark);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
-    */
+     * 设置 备注
+     * @param remarkList
+     */
     public PersonQuery remarkList(List<String> remarkList){
         this.remarkList = remarkList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param source
-    */
+     * 设置  注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param source
+     */
     public PersonQuery source(Integer source){
-	    setSource(source);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceStart
-    */
+        setSource(source);
+        return this;
+    }
+
+    /**
+     * 设置 开始 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceStart
+     */
     public PersonQuery sourceStart(Integer sourceStart){
-		this.sourceStart = sourceStart;
-		return this;
+        this.sourceStart = sourceStart;
+        return this;
     }
 
     /**
-    * 设置 结束 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceEnd
-    */
+     * 设置 结束 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceEnd
+     */
     public PersonQuery sourceEnd(Integer sourceEnd){
-		this.sourceEnd = sourceEnd;
-		return this;
+        this.sourceEnd = sourceEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceIncrement
-    */
+     * 设置 增加 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceIncrement
+     */
     public PersonQuery sourceIncrement(Integer sourceIncrement){
-		this.sourceIncrement = sourceIncrement;
-		return this;
+        this.sourceIncrement = sourceIncrement;
+        return this;
     }
 
     /**
-    * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-    * @param sourceList
-    */
+     * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceList
+     */
     public PersonQuery sourceList(List<Integer> sourceList){
         this.sourceList = sourceList;
-		return this;
-        }
-
-        /**
-        * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
-        * @param sourceNotList
-        */
-        public PersonQuery sourceNotList(List<Integer> sourceNotList){
+        return this;
+    }
+
+    /**
+     * 设置 注册人员来源(0.预约系统,1.排队叫号系统,2.自助服务系统,99.其它)
+     * @param sourceNotList
+     */
+    public PersonQuery sourceNotList(List<Integer> sourceNotList){
         this.sourceNotList = sourceNotList;
         return this;
-        }
+    }
 
     /**
-    * 设置  是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHk
-    */
+     * 设置  是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHk
+     */
     public PersonQuery inFaceHk(Integer inFaceHk){
-	    setInFaceHk(inFaceHk);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkStart
-    */
+        setInFaceHk(inFaceHk);
+        return this;
+    }
+
+    /**
+     * 设置 开始 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkStart
+     */
     public PersonQuery inFaceHkStart(Integer inFaceHkStart){
-		this.inFaceHkStart = inFaceHkStart;
-		return this;
+        this.inFaceHkStart = inFaceHkStart;
+        return this;
     }
 
     /**
-    * 设置 结束 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkEnd
-    */
+     * 设置 结束 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkEnd
+     */
     public PersonQuery inFaceHkEnd(Integer inFaceHkEnd){
-		this.inFaceHkEnd = inFaceHkEnd;
-		return this;
+        this.inFaceHkEnd = inFaceHkEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkIncrement
-    */
+     * 设置 增加 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkIncrement
+     */
     public PersonQuery inFaceHkIncrement(Integer inFaceHkIncrement){
-		this.inFaceHkIncrement = inFaceHkIncrement;
-		return this;
+        this.inFaceHkIncrement = inFaceHkIncrement;
+        return this;
     }
 
     /**
-    * 设置 是否添加到海康人脸库(0.否，1.是)
-    * @param inFaceHkList
-    */
+     * 设置 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkList
+     */
     public PersonQuery inFaceHkList(List<Integer> inFaceHkList){
         this.inFaceHkList = inFaceHkList;
-		return this;
-        }
-
-        /**
-        * 设置 是否添加到海康人脸库(0.否，1.是)
-        * @param inFaceHkNotList
-        */
-        public PersonQuery inFaceHkNotList(List<Integer> inFaceHkNotList){
+        return this;
+    }
+
+    /**
+     * 设置 是否添加到海康人脸库(0.否，1.是)
+     * @param inFaceHkNotList
+     */
+    public PersonQuery inFaceHkNotList(List<Integer> inFaceHkNotList){
         this.inFaceHkNotList = inFaceHkNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 设置 人脸的唯一标识
-    * @param indexCode
-    */
+    /**
+     * 设置 人脸的唯一标识
+     * @param indexCode
+     */
     public PersonQuery indexCode(String indexCode){
         setIndexCode(indexCode);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 人脸的唯一标识
-    * @param indexCodeList
-    */
+     * 设置 人脸的唯一标识
+     * @param indexCodeList
+     */
     public PersonQuery indexCodeList(List<String> indexCodeList){
         this.indexCodeList = indexCodeList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 设置 人脸所属的人脸分组的唯一标识
-    * @param ifaceGroupIndexCode
-    */
+    /**
+     * 设置 人脸所属的人脸分组的唯一标识
+     * @param ifaceGroupIndexCode
+     */
     public PersonQuery ifaceGroupIndexCode(String ifaceGroupIndexCode){
         setIfaceGroupIndexCode(ifaceGroupIndexCode);
-		return this;
+        return this;
     }
 
     /**
-    * 设置 人脸所属的人脸分组的唯一标识
-    * @param ifaceGroupIndexCodeList
-    */
+     * 设置 人脸所属的人脸分组的唯一标识
+     * @param ifaceGroupIndexCodeList
+     */
     public PersonQuery ifaceGroupIndexCodeList(List<String> ifaceGroupIndexCodeList){
         this.ifaceGroupIndexCodeList = ifaceGroupIndexCodeList;
-		return this;
+        return this;
     }
 
     /**
-    * 设置  创建用户
-    * @param createUserId
-    */
+     * 设置  创建用户
+     * @param createUserId
+     */
     public PersonQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 创建用户
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
     public PersonQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 创建用户
-    * @param createUserIdEnd
-    */
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
     public PersonQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 创建用户
-    * @param createUserIdIncrement
-    */
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
     public PersonQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 创建用户
-    * @param createUserIdList
-    */
+     * 设置 创建用户
+     * @param createUserIdList
+     */
     public PersonQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-        /**
-        * 设置 创建用户
-        * @param createUserIdNotList
-        */
-        public PersonQuery createUserIdNotList(List<Long> createUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public PersonQuery createUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
         return this;
-        }
+    }
 
 
     /**
-    * 设置  更新用户
-    * @param updateUserId
-    */
+     * 设置  更新用户
+     * @param updateUserId
+     */
     public PersonQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 更新用户
-    * @param updateUserIdStart
-    */
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 更新用户
+     * @param updateUserIdStart
+     */
     public PersonQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
-		return this;
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
     }
 
     /**
-    * 设置 结束 更新用户
-    * @param updateUserIdEnd
-    */
+     * 设置 结束 更新用户
+     * @param updateUserIdEnd
+     */
     public PersonQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
-		return this;
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
     }
 
     /**
-    * 设置 增加 更新用户
-    * @param updateUserIdIncrement
-    */
+     * 设置 增加 更新用户
+     * @param updateUserIdIncrement
+     */
     public PersonQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
-		return this;
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
     }
 
     /**
-    * 设置 更新用户
-    * @param updateUserIdList
-    */
+     * 设置 更新用户
+     * @param updateUserIdList
+     */
     public PersonQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-		return this;
-        }
-
-        /**
-        * 设置 更新用户
-        * @param updateUserIdNotList
-        */
-        public PersonQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
+    public PersonQuery updateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
         return this;
-        }
+    }
 
 
     /**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<PersonQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<PersonQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<PersonQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<PersonQuery> andConditionList){
         this.andConditionList = andConditionList;
     }

refined-manager/src/main/resources/bootstrap.yml

@@ -61,6 +61,8 @@ sms:
   smsSendUrl: @profiles.sms.smsSendUrl@
   apiId: @profiles.sms.apiId@
   type: @profiles.sms.type@
+php:
+  host: @profiles.php.host@
 hik:
   host: @profiles.hik.host@
   appKey: @profiles.hik.appKey@

refined-manager/src/main/resources/sqlmap/module/appointment/AppointmentPersonMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.appointment.dao.ibatis.AppointmentPersonDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="AppointmentPersonEntity" id="AppointmentPersonEntity-Map">
+            <id  property="id" column="id" />
+            <result property="siteId" column="siteId" />
+            <result property="siteName" column="siteName" />
+            <result property="personId" column="personId" />
+            <result property="name" column="name" />
+            <result property="contactInfo" column="contactInfo" />
+            <result property="idNumber" column="idNumber" />
+            <result property="reservationService" column="reservationService" />
+            <result property="reservationNumber" column="reservationNumber" />
+            <result property="appointmentTime" column="appointmentTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.siteId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                    a.siteName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('personId') or colPickMode == 1 and data.containsKey('personId')))">
+                    a.personId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('contactInfo') or colPickMode == 1 and data.containsKey('contactInfo')))">
+                    a.contactInfo,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idNumber') or colPickMode == 1 and data.containsKey('idNumber')))">
+                    a.idNumber,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reservationService') or colPickMode == 1 and data.containsKey('reservationService')))">
+                    a.reservationService,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reservationNumber') or colPickMode == 1 and data.containsKey('reservationNumber')))">
+                    a.reservationNumber,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appointmentTime') or colPickMode == 1 and data.containsKey('appointmentTime')))">
+                    a.appointmentTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="AppointmentPersonEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_appointment_person
+        (siteId,siteName,personId,name,contactInfo,idNumber,reservationService,reservationNumber,appointmentTime,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{siteId},#{siteName},#{personId},#{name},#{contactInfo},#{idNumber},#{reservationService},#{reservationNumber},#{appointmentTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_appointment_person
+        (siteId,siteName,personId,name,contactInfo,idNumber,reservationService,reservationNumber,appointmentTime,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.siteId},#{item.siteName},#{item.personId},#{item.name},#{item.contactInfo},#{item.idNumber},#{item.reservationService},#{item.reservationNumber},#{item.appointmentTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_appointment_person as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('personId')) or (colPickMode==1 and !data.containsKey('personId'))">
+                a.personId=#{data.personId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('personIdIncrement')) or (colPickMode==1 and !data.containsKey('personIdIncrement'))">
+                a.personId=ifnull(a.personId,0) + #{data.personIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('contactInfo')) or (colPickMode==1 and !data.containsKey('contactInfo'))">
+                a.contactInfo=#{data.contactInfo},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('idNumber')) or (colPickMode==1 and !data.containsKey('idNumber'))">
+                a.idNumber=#{data.idNumber},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('reservationService')) or (colPickMode==1 and !data.containsKey('reservationService'))">
+                a.reservationService=#{data.reservationService},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('reservationNumber')) or (colPickMode==1 and !data.containsKey('reservationNumber'))">
+                a.reservationNumber=#{data.reservationNumber},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appointmentTime')) or (colPickMode==1 and !data.containsKey('appointmentTime'))">
+                a.appointmentTime=#{data.appointmentTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_appointment_person as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                                        when a.id=#{item.id} then #{item.siteId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                            when a.id=#{item.id} then #{item.siteName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="personId=(case" suffix="ELSE personId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('personId')) or (colPickMode==1 and !item.containsKey('personId'))">
+                                        when a.id=#{item.id} then #{item.personId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('personIdIncrement')) or (colPickMode==1 and !item.containsKey('personIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.personId,0) + #{item.personIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="contactInfo=(case" suffix="ELSE contactInfo end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('contactInfo')) or (colPickMode==1 and !item.containsKey('contactInfo'))">
+                            when a.id=#{item.id} then #{item.contactInfo}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="idNumber=(case" suffix="ELSE idNumber end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('idNumber')) or (colPickMode==1 and !item.containsKey('idNumber'))">
+                            when a.id=#{item.id} then #{item.idNumber}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="reservationService=(case" suffix="ELSE reservationService end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('reservationService')) or (colPickMode==1 and !item.containsKey('reservationService'))">
+                            when a.id=#{item.id} then #{item.reservationService}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="reservationNumber=(case" suffix="ELSE reservationNumber end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('reservationNumber')) or (colPickMode==1 and !item.containsKey('reservationNumber'))">
+                            when a.id=#{item.id} then #{item.reservationNumber}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="appointmentTime=(case" suffix="ELSE appointmentTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('appointmentTime')) or (colPickMode==1 and !item.containsKey('appointmentTime'))">
+                            when a.id=#{item.id} then #{item.appointmentTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="AppointmentPersonEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_appointment_person as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_appointment_person as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_appointment_person where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_appointment_person where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_appointment_person where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_appointment_person as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="AppointmentPersonEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_appointment_person as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_appointment_person as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.siteId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.siteId in
+                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+                ${_conditionType_} a.siteId not in
+                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('siteName')">
+                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                    ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
+                </if>
+                <if test="conditionParamRef.siteName == null">
+                    ${_conditionType_} a.siteName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.siteName in
+                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+                ${_conditionType_} a.siteName not in
+                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('personId')">
+                <if test="conditionParamRef.personId != null ">
+                    ${_conditionType_} a.personId = #{${_conditionParam_}.personId}
+                </if>
+                <if test="conditionParamRef.personId == null">
+                    ${_conditionType_} a.personId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('personIdList') and conditionParamRef.personIdList.size() > 0">
+                ${_conditionType_} a.personId in
+                <foreach collection="conditionParamRef.personIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('personIdNotList') and conditionParamRef.personIdNotList.size() > 0">
+                ${_conditionType_} a.personId not in
+                <foreach collection="conditionParamRef.personIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('personIdStart') and conditionParamRef.personIdStart != null">
+                ${_conditionType_} a.personId <![CDATA[ >= ]]> #{${_conditionParam_}.personIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('personIdEnd') and conditionParamRef.personIdEnd != null">
+                ${_conditionType_} a.personId <![CDATA[ <= ]]> #{${_conditionParam_}.personIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
+                ${_conditionType_} a.name not in
+                <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('contactInfo')">
+                <if test="conditionParamRef.contactInfo != null and conditionParamRef.contactInfo != ''">
+                    ${_conditionType_} a.contactInfo like #{${_conditionParam_}.contactInfo}
+                </if>
+                <if test="conditionParamRef.contactInfo == null">
+                    ${_conditionType_} a.contactInfo is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contactInfoList') and conditionParamRef.contactInfoList.size() > 0">
+                ${_conditionType_} a.contactInfo in
+                <foreach collection="conditionParamRef.contactInfoList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('contactInfoNotList') and conditionParamRef.contactInfoNotList.size() > 0">
+                ${_conditionType_} a.contactInfo not in
+                <foreach collection="conditionParamRef.contactInfoNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('idNumber')">
+                <if test="conditionParamRef.idNumber != null and conditionParamRef.idNumber != ''">
+                    ${_conditionType_} a.idNumber like #{${_conditionParam_}.idNumber}
+                </if>
+                <if test="conditionParamRef.idNumber == null">
+                    ${_conditionType_} a.idNumber is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idNumberList') and conditionParamRef.idNumberList.size() > 0">
+                ${_conditionType_} a.idNumber in
+                <foreach collection="conditionParamRef.idNumberList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNumberNotList') and conditionParamRef.idNumberNotList.size() > 0">
+                ${_conditionType_} a.idNumber not in
+                <foreach collection="conditionParamRef.idNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('reservationService')">
+                <if test="conditionParamRef.reservationService != null and conditionParamRef.reservationService != ''">
+                    ${_conditionType_} a.reservationService like #{${_conditionParam_}.reservationService}
+                </if>
+                <if test="conditionParamRef.reservationService == null">
+                    ${_conditionType_} a.reservationService is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('reservationServiceList') and conditionParamRef.reservationServiceList.size() > 0">
+                ${_conditionType_} a.reservationService in
+                <foreach collection="conditionParamRef.reservationServiceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reservationServiceNotList') and conditionParamRef.reservationServiceNotList.size() > 0">
+                ${_conditionType_} a.reservationService not in
+                <foreach collection="conditionParamRef.reservationServiceNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('reservationNumber')">
+                <if test="conditionParamRef.reservationNumber != null and conditionParamRef.reservationNumber != ''">
+                    ${_conditionType_} a.reservationNumber like #{${_conditionParam_}.reservationNumber}
+                </if>
+                <if test="conditionParamRef.reservationNumber == null">
+                    ${_conditionType_} a.reservationNumber is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('reservationNumberList') and conditionParamRef.reservationNumberList.size() > 0">
+                ${_conditionType_} a.reservationNumber in
+                <foreach collection="conditionParamRef.reservationNumberList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reservationNumberNotList') and conditionParamRef.reservationNumberNotList.size() > 0">
+                ${_conditionType_} a.reservationNumber not in
+                <foreach collection="conditionParamRef.reservationNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('appointmentTime')">
+                <if test="conditionParamRef.appointmentTime != null ">
+                    ${_conditionType_} a.appointmentTime = #{${_conditionParam_}.appointmentTime}
+                </if>
+                <if test="conditionParamRef.appointmentTime == null">
+                    ${_conditionType_} a.appointmentTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('appointmentTimeStart') and conditionParamRef.appointmentTimeStart != null and conditionParamRef.appointmentTimeStart!=''">
+                ${_conditionType_} a.appointmentTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appointmentTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('appointmentTimeEnd') and conditionParamRef.appointmentTimeEnd != null and conditionParamRef.appointmentTimeEnd!=''">
+                ${_conditionType_} a.appointmentTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appointmentTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteId')">
+                        a.siteId
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteName')">
+                        a.siteName
+                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('personId')">
+                        a.personId
+                        <if test='orderCol.personId != null and "DESC".equalsIgnoreCase(orderCol.personId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('contactInfo')">
+                        a.contactInfo
+                        <if test='orderCol.contactInfo != null and "DESC".equalsIgnoreCase(orderCol.contactInfo)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('idNumber')">
+                        a.idNumber
+                        <if test='orderCol.idNumber != null and "DESC".equalsIgnoreCase(orderCol.idNumber)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('reservationService')">
+                        a.reservationService
+                        <if test='orderCol.reservationService != null and "DESC".equalsIgnoreCase(orderCol.reservationService)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('reservationNumber')">
+                        a.reservationNumber
+                        <if test='orderCol.reservationNumber != null and "DESC".equalsIgnoreCase(orderCol.reservationNumber)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('appointmentTime')">
+                        a.appointmentTime
+                        <if test='orderCol.appointmentTime != null and "DESC".equalsIgnoreCase(orderCol.appointmentTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

refined-manager/src/main/resources/sqlmap/module/person/PersonMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
-<mapper namespace="com.mortals.xhx.module.person.dao.ibatis.PersonDaoImpl">
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.appointment.dao.ibatis.AppointmentPersonDaoImpl">
 
     <!-- 字段和属性映射 -->
-    <resultMap type="PersonEntity" id="PersonEntity-Map">
-            <id  property="id" column="id" />
-            <result property="siteId" column="siteId" />
-            <result property="siteName" column="siteName" />
-            <result property="name" column="name" />
-            <result property="idCard" column="idCard" />
-            <result property="gender" column="gender" />
-            <result property="phone" column="phone" />
-            <result property="birthday" column="birthday" />
-            <result property="address" column="address" />
-            <result property="photo" column="photo" />
-            <result property="remark" column="remark" />
-            <result property="source" column="source" />
-            <result property="inFaceHk" column="inFaceHk" />
-            <result property="indexCode" column="indexCode" />
-            <result property="ifaceGroupIndexCode" column="ifaceGroupIndexCode" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createTime" column="createTime" />
-            <result property="updateUserId" column="updateUserId" />
-            <result property="updateTime" column="updateTime" />
-            
+    <resultMap type="AppointmentPersonEntity" id="AppointmentPersonEntity-Map">
+        <id  property="id" column="id" />
+        <result property="siteId" column="siteId" />
+        <result property="siteName" column="siteName" />
+        <result property="personId" column="personId" />
+        <result property="name" column="name" />
+        <result property="contactInfo" column="contactInfo" />
+        <result property="idCard" column="idCard" />
+        <result property="bussinessId" column="bussinessId" />
+        <result property="bussinessName" column="bussinessName" />
+        <result property="appontmentNumber" column="appontmentNumber" />
+        <result property="appointmentStartTime" column="appointmentStartTime" />
+        <result property="appointmentEndTime" column="appointmentEndTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createTime" column="createTime" />
+        <result property="updateUserId" column="updateUserId" />
+        <result property="updateTime" column="updateTime" />
+
     </resultMap>
 
 
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
-                    a.id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
-                    a.siteId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
-                    a.siteName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
-                    a.name,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
-                    a.idCard,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('gender') or colPickMode == 1 and data.containsKey('gender')))">
-                    a.gender,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))">
-                    a.phone,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('birthday') or colPickMode == 1 and data.containsKey('birthday')))">
-                    a.birthday,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
-                    a.address,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('photo') or colPickMode == 1 and data.containsKey('photo')))">
-                    a.photo,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
-                    a.remark,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
-                    a.source,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('inFaceHk') or colPickMode == 1 and data.containsKey('inFaceHk')))">
-                    a.inFaceHk,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('indexCode') or colPickMode == 1 and data.containsKey('indexCode')))">
-                    a.indexCode,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ifaceGroupIndexCode') or colPickMode == 1 and data.containsKey('ifaceGroupIndexCode')))">
-                    a.ifaceGroupIndexCode,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                    a.createUserId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                    a.createTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
-                    a.updateUserId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                    a.updateTime,
-                </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('personId') or colPickMode == 1 and data.containsKey('personId')))">
+                a.personId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                a.name,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('contactInfo') or colPickMode == 1 and data.containsKey('contactInfo')))">
+                a.contactInfo,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
+                a.idCard,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bussinessId') or colPickMode == 1 and data.containsKey('bussinessId')))">
+                a.bussinessId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bussinessName') or colPickMode == 1 and data.containsKey('bussinessName')))">
+                a.bussinessName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appontmentNumber') or colPickMode == 1 and data.containsKey('appontmentNumber')))">
+                a.appontmentNumber,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appointmentStartTime') or colPickMode == 1 and data.containsKey('appointmentStartTime')))">
+                a.appointmentStartTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appointmentEndTime') or colPickMode == 1 and data.containsKey('appointmentEndTime')))">
+                a.appointmentEndTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                a.createUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                a.createTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                a.updateUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                a.updateTime,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
-    <insert id="insert" parameterType="PersonEntity"  useGeneratedKeys="true" keyProperty="id">
-        insert into mortals_xhx_person
-        (siteId,siteName,name,idCard,gender,phone,birthday,address,photo,remark,source,inFaceHk,indexCode,ifaceGroupIndexCode,createUserId,createTime,updateUserId,updateTime)
+    <insert id="insert" parameterType="AppointmentPersonEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_appointment_person
+        (siteId,siteName,personId,name,contactInfo,idCard,bussinessId,bussinessName,appontmentNumber,appointmentStartTime,appointmentEndTime,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{siteId},#{siteName},#{name},#{idCard},#{gender},#{phone},#{birthday},#{address},#{photo},#{remark},#{source},#{inFaceHk},#{indexCode},#{ifaceGroupIndexCode},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{siteName},#{personId},#{name},#{contactInfo},#{idCard},#{bussinessId},#{bussinessName},#{appontmentNumber},#{appointmentStartTime},#{appointmentEndTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
-        insert into mortals_xhx_person
-        (siteId,siteName,name,idCard,gender,phone,birthday,address,photo,remark,source,inFaceHk,indexCode,ifaceGroupIndexCode,createUserId,createTime,updateUserId,updateTime)
+        insert into mortals_xhx_appointment_person
+        (siteId,siteName,personId,name,contactInfo,idCard,bussinessId,bussinessName,appontmentNumber,appointmentStartTime,appointmentEndTime,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.name},#{item.idCard},#{item.gender},#{item.phone},#{item.birthday},#{item.address},#{item.photo},#{item.remark},#{item.source},#{item.inFaceHk},#{item.indexCode},#{item.ifaceGroupIndexCode},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.personId},#{item.name},#{item.contactInfo},#{item.idCard},#{item.bussinessId},#{item.bussinessName},#{item.appontmentNumber},#{item.appointmentStartTime},#{item.appointmentEndTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
 
     <!-- 根据ParamDto更新 -->
     <update id="update" parameterType="paramDto">
-        update mortals_xhx_person as a
+        update mortals_xhx_appointment_person as a
         set
         <trim suffixOverrides="," suffix="">
             <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
@@ -123,50 +111,38 @@
             <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
                 a.siteName=#{data.siteName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('personId')) or (colPickMode==1 and !data.containsKey('personId'))">
+                a.personId=#{data.personId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('personIdIncrement')) or (colPickMode==1 and !data.containsKey('personIdIncrement'))">
+                a.personId=ifnull(a.personId,0) + #{data.personIdIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
                 a.name=#{data.name},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('contactInfo')) or (colPickMode==1 and !data.containsKey('contactInfo'))">
+                a.contactInfo=#{data.contactInfo},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
                 a.idCard=#{data.idCard},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('gender')) or (colPickMode==1 and !data.containsKey('gender'))">
-                a.gender=#{data.gender},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('genderIncrement')) or (colPickMode==1 and !data.containsKey('genderIncrement'))">
-                a.gender=ifnull(a.gender,0) + #{data.genderIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('phone')) or (colPickMode==1 and !data.containsKey('phone'))">
-                a.phone=#{data.phone},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('birthday')) or (colPickMode==1 and !data.containsKey('birthday'))">
-                a.birthday=#{data.birthday},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
-                a.address=#{data.address},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('photo')) or (colPickMode==1 and !data.containsKey('photo'))">
-                a.photo=#{data.photo},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
-                a.remark=#{data.remark},
+            <if test="(colPickMode==0 and data.containsKey('bussinessId')) or (colPickMode==1 and !data.containsKey('bussinessId'))">
+                a.bussinessId=#{data.bussinessId},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
-                a.source=#{data.source},
+            <if test="(colPickMode==0 and data.containsKey('bussinessIdIncrement')) or (colPickMode==1 and !data.containsKey('bussinessIdIncrement'))">
+                a.bussinessId=ifnull(a.bussinessId,0) + #{data.bussinessIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
-                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            <if test="(colPickMode==0 and data.containsKey('bussinessName')) or (colPickMode==1 and !data.containsKey('bussinessName'))">
+                a.bussinessName=#{data.bussinessName},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('inFaceHk')) or (colPickMode==1 and !data.containsKey('inFaceHk'))">
-                a.inFaceHk=#{data.inFaceHk},
+            <if test="(colPickMode==0 and data.containsKey('appontmentNumber')) or (colPickMode==1 and !data.containsKey('appontmentNumber'))">
+                a.appontmentNumber=#{data.appontmentNumber},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('inFaceHkIncrement')) or (colPickMode==1 and !data.containsKey('inFaceHkIncrement'))">
-                a.inFaceHk=ifnull(a.inFaceHk,0) + #{data.inFaceHkIncrement},
+            <if test="(colPickMode==0 and data.containsKey('appointmentStartTime')) or (colPickMode==1 and !data.containsKey('appointmentStartTime'))">
+                a.appointmentStartTime=#{data.appointmentStartTime},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('indexCode')) or (colPickMode==1 and !data.containsKey('indexCode'))">
-                a.indexCode=#{data.indexCode},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('ifaceGroupIndexCode')) or (colPickMode==1 and !data.containsKey('ifaceGroupIndexCode'))">
-                a.ifaceGroupIndexCode=#{data.ifaceGroupIndexCode},
+            <if test="(colPickMode==0 and data.containsKey('appointmentEndTime')) or (colPickMode==1 and !data.containsKey('appointmentEndTime'))">
+                a.appointmentEndTime=#{data.appointmentEndTime},
             </if>
             <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
                 a.createUserId=#{data.createUserId},
@@ -196,164 +172,138 @@
     </update>
     <!-- 批量更新 -->
     <update id="updateBatch" parameterType="paramDto">
-        update mortals_xhx_person as a
+        update mortals_xhx_appointment_person as a
         <trim prefix="set" suffixOverrides=",">
-                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
-                                        when a.id=#{item.id} then #{item.siteId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="siteName=(case" suffix="ELSE siteName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
-                            when a.id=#{item.id} then #{item.siteName}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="name=(case" suffix="ELSE name end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
-                            when a.id=#{item.id} then #{item.name}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="idCard=(case" suffix="ELSE idCard end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
-                            when a.id=#{item.id} then #{item.idCard}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="gender=(case" suffix="ELSE gender end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('gender')) or (colPickMode==1 and !item.containsKey('gender'))">
-                                        when a.id=#{item.id} then #{item.gender}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('genderIncrement')) or (colPickMode==1 and !item.containsKey('genderIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.gender,0) + #{item.genderIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="phone=(case" suffix="ELSE phone end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('phone')) or (colPickMode==1 and !item.containsKey('phone'))">
-                            when a.id=#{item.id} then #{item.phone}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="birthday=(case" suffix="ELSE birthday end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('birthday')) or (colPickMode==1 and !item.containsKey('birthday'))">
-                            when a.id=#{item.id} then #{item.birthday}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="address=(case" suffix="ELSE address end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('address')) or (colPickMode==1 and !item.containsKey('address'))">
-                            when a.id=#{item.id} then #{item.address}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="photo=(case" suffix="ELSE photo end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('photo')) or (colPickMode==1 and !item.containsKey('photo'))">
-                            when a.id=#{item.id} then #{item.photo}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="remark=(case" suffix="ELSE remark end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
-                            when a.id=#{item.id} then #{item.remark}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="source=(case" suffix="ELSE source end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
-                                        when a.id=#{item.id} then #{item.source}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="inFaceHk=(case" suffix="ELSE inFaceHk end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('inFaceHk')) or (colPickMode==1 and !item.containsKey('inFaceHk'))">
-                                        when a.id=#{item.id} then #{item.inFaceHk}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('inFaceHkIncrement')) or (colPickMode==1 and !item.containsKey('inFaceHkIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.inFaceHk,0) + #{item.inFaceHkIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="indexCode=(case" suffix="ELSE indexCode end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('indexCode')) or (colPickMode==1 and !item.containsKey('indexCode'))">
-                            when a.id=#{item.id} then #{item.indexCode}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="ifaceGroupIndexCode=(case" suffix="ELSE ifaceGroupIndexCode end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('ifaceGroupIndexCode')) or (colPickMode==1 and !item.containsKey('ifaceGroupIndexCode'))">
-                            when a.id=#{item.id} then #{item.ifaceGroupIndexCode}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
-                                        when a.id=#{item.id} then #{item.updateUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                            when a.id=#{item.id} then #{item.updateTime}
-                        </if>
-                    </foreach>
-                </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="personId=(case" suffix="ELSE personId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('personId')) or (colPickMode==1 and !item.containsKey('personId'))">
+                            when a.id=#{item.id} then #{item.personId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('personIdIncrement')) or (colPickMode==1 and !item.containsKey('personIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.personId,0) + #{item.personIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="name=(case" suffix="ELSE name end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                        when a.id=#{item.id} then #{item.name}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="contactInfo=(case" suffix="ELSE contactInfo end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('contactInfo')) or (colPickMode==1 and !item.containsKey('contactInfo'))">
+                        when a.id=#{item.id} then #{item.contactInfo}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="idCard=(case" suffix="ELSE idCard end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
+                        when a.id=#{item.id} then #{item.idCard}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="bussinessId=(case" suffix="ELSE bussinessId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('bussinessId')) or (colPickMode==1 and !item.containsKey('bussinessId'))">
+                            when a.id=#{item.id} then #{item.bussinessId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('bussinessIdIncrement')) or (colPickMode==1 and !item.containsKey('bussinessIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.bussinessId,0) + #{item.bussinessIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="bussinessName=(case" suffix="ELSE bussinessName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('bussinessName')) or (colPickMode==1 and !item.containsKey('bussinessName'))">
+                        when a.id=#{item.id} then #{item.bussinessName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="appontmentNumber=(case" suffix="ELSE appontmentNumber end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appontmentNumber')) or (colPickMode==1 and !item.containsKey('appontmentNumber'))">
+                        when a.id=#{item.id} then #{item.appontmentNumber}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="appointmentStartTime=(case" suffix="ELSE appointmentStartTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appointmentStartTime')) or (colPickMode==1 and !item.containsKey('appointmentStartTime'))">
+                        when a.id=#{item.id} then #{item.appointmentStartTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="appointmentEndTime=(case" suffix="ELSE appointmentEndTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appointmentEndTime')) or (colPickMode==1 and !item.containsKey('appointmentEndTime'))">
+                        when a.id=#{item.id} then #{item.appointmentEndTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                            when a.id=#{item.id} then #{item.createUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                        when a.id=#{item.id} then #{item.createTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                            when a.id=#{item.id} then #{item.updateUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                        when a.id=#{item.id} then #{item.updateTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -361,25 +311,25 @@
         </foreach>
     </update>
     <!-- 根据主健查询 -->
-    <select id="getByKey" parameterType="paramDto" resultMap="PersonEntity-Map">
+    <select id="getByKey" parameterType="paramDto" resultMap="AppointmentPersonEntity-Map">
         select <include refid="_columns"/>
-        from mortals_xhx_person as a
+        from mortals_xhx_appointment_person as a
         where a.id=#{condition.id}
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_person as a where a.id=#{condition.id}
+        delete a.* from mortals_xhx_appointment_person as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
-        delete from mortals_xhx_person where id in
+        delete from mortals_xhx_appointment_person where id in
         <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </delete>
     <!-- 根据主健列表删除一批，针对单一主健有效 -->
     <delete id="deleteByKeyList">
-        delete from mortals_xhx_person where id in
+        delete from mortals_xhx_appointment_person where id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -387,14 +337,14 @@
 
     <!-- 根据对象列表删除一批，针对单一主健有效 -->
     <delete id="deleteByEntityList">
-        delete from mortals_xhx_person where id in
+        delete from mortals_xhx_appointment_person where id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item.id}
         </foreach>
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_person as a
+        delete a.* from mortals_xhx_appointment_person as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -403,9 +353,9 @@
         </trim>
     </delete>
     <!-- 获取列表 -->
-    <select id="getList" parameterType="paramDto" resultMap="PersonEntity-Map">
+    <select id="getList" parameterType="paramDto" resultMap="AppointmentPersonEntity-Map">
         select <include refid="_columns"/>
-        from mortals_xhx_person as a
+        from mortals_xhx_appointment_person as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -420,7 +370,7 @@
     <!-- 获取 -->
     <select id="getListCount" parameterType="paramDto" resultType="int">
         select count(1)
-        from mortals_xhx_person as a
+        from mortals_xhx_appointment_person as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -470,537 +420,447 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('id')">
-                <if test="conditionParamRef.id != null ">
-                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
-                </if>
-                <if test="conditionParamRef.id == null">
-                    ${_conditionType_} a.id is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                ${_conditionType_} a.id in
-                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
-                ${_conditionType_} a.id not in
-                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
-            </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
-            </if>
-
-            <if test="conditionParamRef.containsKey('siteId')">
-                <if test="conditionParamRef.siteId != null ">
-                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
-                </if>
-                <if test="conditionParamRef.siteId == null">
-                    ${_conditionType_} a.siteId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                ${_conditionType_} a.siteId in
-                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
-                ${_conditionType_} a.siteId not in
-                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
-                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
-                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
 
-
-            <if test="conditionParamRef.containsKey('siteName')">
-                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
-                    ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
-                </if>
-                <if test="conditionParamRef.siteName == null">
-                    ${_conditionType_} a.siteName is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
-                ${_conditionType_} a.siteName in
-                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
             </if>
-            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
-                ${_conditionType_} a.siteName not in
-                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('name')">
-                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
-                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
-                </if>
-                <if test="conditionParamRef.name == null">
-                    ${_conditionType_} a.name is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
-                ${_conditionType_} a.name in
-                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
-                ${_conditionType_} a.name not in
-                <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
 
-            <if test="conditionParamRef.containsKey('idCard')">
-                <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
-                    ${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
-                </if>
-                <if test="conditionParamRef.idCard == null">
-                    ${_conditionType_} a.idCard is null
-                </if>
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
             </if>
-            <if test="conditionParamRef.containsKey('idCardList') and conditionParamRef.idCardList.size() > 0">
-                ${_conditionType_} a.idCard in
-                <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idCardNotList') and conditionParamRef.idCardNotList.size() > 0">
-                ${_conditionType_} a.idCard not in
-                <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
             </if>
-            <if test="conditionParamRef.containsKey('gender')">
-                <if test="conditionParamRef.gender != null ">
-                    ${_conditionType_} a.gender = #{${_conditionParam_}.gender}
-                </if>
-                <if test="conditionParamRef.gender == null">
-                    ${_conditionType_} a.gender is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
-                ${_conditionType_} a.gender in
-                <foreach collection="conditionParamRef.genderList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('genderNotList') and conditionParamRef.genderNotList.size() > 0">
-                ${_conditionType_} a.gender not in
-                <foreach collection="conditionParamRef.genderNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('genderStart') and conditionParamRef.genderStart != null">
-                ${_conditionType_} a.gender <![CDATA[ >= ]]> #{${_conditionParam_}.genderStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('personId')">
+            <if test="conditionParamRef.personId != null ">
+                ${_conditionType_} a.personId = #{${_conditionParam_}.personId}
             </if>
-            <if test="conditionParamRef.containsKey('genderEnd') and conditionParamRef.genderEnd != null">
-                ${_conditionType_} a.gender <![CDATA[ <= ]]> #{${_conditionParam_}.genderEnd}
+            <if test="conditionParamRef.personId == null">
+                ${_conditionType_} a.personId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('personIdList') and conditionParamRef.personIdList.size() > 0">
+            ${_conditionType_} a.personId in
+            <foreach collection="conditionParamRef.personIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('personIdNotList') and conditionParamRef.personIdNotList.size() > 0">
+            ${_conditionType_} a.personId not in
+            <foreach collection="conditionParamRef.personIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('personIdStart') and conditionParamRef.personIdStart != null">
+            ${_conditionType_} a.personId <![CDATA[ >= ]]> #{${_conditionParam_}.personIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('personIdEnd') and conditionParamRef.personIdEnd != null">
+            ${_conditionType_} a.personId <![CDATA[ <= ]]> #{${_conditionParam_}.personIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('phone')">
-                <if test="conditionParamRef.phone != null and conditionParamRef.phone != ''">
-                    ${_conditionType_} a.phone like #{${_conditionParam_}.phone}
-                </if>
-                <if test="conditionParamRef.phone == null">
-                    ${_conditionType_} a.phone is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('phoneList') and conditionParamRef.phoneList.size() > 0">
-                ${_conditionType_} a.phone in
-                <foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('name')">
+            <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                ${_conditionType_} a.name like #{${_conditionParam_}.name}
             </if>
-            <if test="conditionParamRef.containsKey('phoneNotList') and conditionParamRef.phoneNotList.size() > 0">
-                ${_conditionType_} a.phone not in
-                <foreach collection="conditionParamRef.phoneNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.name == null">
+                ${_conditionType_} a.name is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
+            ${_conditionType_} a.name in
+            <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
+            ${_conditionType_} a.name not in
+            <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('birthday')">
-                <if test="conditionParamRef.birthday != null ">
-                    ${_conditionType_} a.birthday = #{${_conditionParam_}.birthday}
-                </if>
-                <if test="conditionParamRef.birthday == null">
-                    ${_conditionType_} a.birthday is null
-                </if>
+        <if test="conditionParamRef.containsKey('contactInfo')">
+            <if test="conditionParamRef.contactInfo != null and conditionParamRef.contactInfo != ''">
+                ${_conditionType_} a.contactInfo like #{${_conditionParam_}.contactInfo}
             </if>
-            <if test="conditionParamRef.containsKey('birthdayStart') and conditionParamRef.birthdayStart != null and conditionParamRef.birthdayStart!=''">
-                ${_conditionType_} a.birthday <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.birthdayStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('birthdayEnd') and conditionParamRef.birthdayEnd != null and conditionParamRef.birthdayEnd!=''">
-                ${_conditionType_} a.birthday <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.birthdayEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.contactInfo == null">
+                ${_conditionType_} a.contactInfo is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('contactInfoList') and conditionParamRef.contactInfoList.size() > 0">
+            ${_conditionType_} a.contactInfo in
+            <foreach collection="conditionParamRef.contactInfoList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('contactInfoNotList') and conditionParamRef.contactInfoNotList.size() > 0">
+            ${_conditionType_} a.contactInfo not in
+            <foreach collection="conditionParamRef.contactInfoNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('address')">
-                <if test="conditionParamRef.address != null and conditionParamRef.address != ''">
-                    ${_conditionType_} a.address like #{${_conditionParam_}.address}
-                </if>
-                <if test="conditionParamRef.address == null">
-                    ${_conditionType_} a.address is null
-                </if>
+        <if test="conditionParamRef.containsKey('idCard')">
+            <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
+                ${_conditionType_} a.idCard like #{${_conditionParam_}.idCard}
             </if>
-            <if test="conditionParamRef.containsKey('addressList') and conditionParamRef.addressList.size() > 0">
-                ${_conditionType_} a.address in
-                <foreach collection="conditionParamRef.addressList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.idCard == null">
+                ${_conditionType_} a.idCard is null
             </if>
-            <if test="conditionParamRef.containsKey('addressNotList') and conditionParamRef.addressNotList.size() > 0">
-                ${_conditionType_} a.address not in
-                <foreach collection="conditionParamRef.addressNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-
-            <if test="conditionParamRef.containsKey('photo')">
-                <if test="conditionParamRef.photo != null and conditionParamRef.photo != ''">
-                    ${_conditionType_} a.photo like #{${_conditionParam_}.photo}
-                </if>
-                <if test="conditionParamRef.photo == null">
-                    ${_conditionType_} a.photo is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('photoList') and conditionParamRef.photoList.size() > 0">
-                ${_conditionType_} a.photo in
-                <foreach collection="conditionParamRef.photoList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idCardList') and conditionParamRef.idCardList.size() > 0">
+            ${_conditionType_} a.idCard in
+            <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idCardNotList') and conditionParamRef.idCardNotList.size() > 0">
+            ${_conditionType_} a.idCard not in
+            <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessId')">
+            <if test="conditionParamRef.bussinessId != null ">
+                ${_conditionType_} a.bussinessId = #{${_conditionParam_}.bussinessId}
             </if>
-            <if test="conditionParamRef.containsKey('photoNotList') and conditionParamRef.photoNotList.size() > 0">
-                ${_conditionType_} a.photo not in
-                <foreach collection="conditionParamRef.photoNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.bussinessId == null">
+                ${_conditionType_} a.bussinessId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessIdList') and conditionParamRef.bussinessIdList.size() > 0">
+            ${_conditionType_} a.bussinessId in
+            <foreach collection="conditionParamRef.bussinessIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessIdNotList') and conditionParamRef.bussinessIdNotList.size() > 0">
+            ${_conditionType_} a.bussinessId not in
+            <foreach collection="conditionParamRef.bussinessIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessIdStart') and conditionParamRef.bussinessIdStart != null">
+            ${_conditionType_} a.bussinessId <![CDATA[ >= ]]> #{${_conditionParam_}.bussinessIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessIdEnd') and conditionParamRef.bussinessIdEnd != null">
+            ${_conditionType_} a.bussinessId <![CDATA[ <= ]]> #{${_conditionParam_}.bussinessIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('remark')">
-                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
-                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
-                </if>
-                <if test="conditionParamRef.remark == null">
-                    ${_conditionType_} a.remark is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
-                ${_conditionType_} a.remark in
-                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
-                ${_conditionType_} a.remark not in
-                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('source')">
-                <if test="conditionParamRef.source != null ">
-                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
-                </if>
-                <if test="conditionParamRef.source == null">
-                    ${_conditionType_} a.source is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
-                ${_conditionType_} a.source in
-                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
-                ${_conditionType_} a.source not in
-                <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
-                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
-            </if>
-            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
-                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
-            </if>
 
-            <if test="conditionParamRef.containsKey('inFaceHk')">
-                <if test="conditionParamRef.inFaceHk != null ">
-                    ${_conditionType_} a.inFaceHk = #{${_conditionParam_}.inFaceHk}
-                </if>
-                <if test="conditionParamRef.inFaceHk == null">
-                    ${_conditionType_} a.inFaceHk is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('inFaceHkList') and conditionParamRef.inFaceHkList.size() > 0">
-                ${_conditionType_} a.inFaceHk in
-                <foreach collection="conditionParamRef.inFaceHkList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('inFaceHkNotList') and conditionParamRef.inFaceHkNotList.size() > 0">
-                ${_conditionType_} a.inFaceHk not in
-                <foreach collection="conditionParamRef.inFaceHkNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('inFaceHkStart') and conditionParamRef.inFaceHkStart != null">
-                ${_conditionType_} a.inFaceHk <![CDATA[ >= ]]> #{${_conditionParam_}.inFaceHkStart}
+        <if test="conditionParamRef.containsKey('bussinessName')">
+            <if test="conditionParamRef.bussinessName != null and conditionParamRef.bussinessName != ''">
+                ${_conditionType_} a.bussinessName like #{${_conditionParam_}.bussinessName}
             </if>
-            <if test="conditionParamRef.containsKey('inFaceHkEnd') and conditionParamRef.inFaceHkEnd != null">
-                ${_conditionType_} a.inFaceHk <![CDATA[ <= ]]> #{${_conditionParam_}.inFaceHkEnd}
+            <if test="conditionParamRef.bussinessName == null">
+                ${_conditionType_} a.bussinessName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessNameList') and conditionParamRef.bussinessNameList.size() > 0">
+            ${_conditionType_} a.bussinessName in
+            <foreach collection="conditionParamRef.bussinessNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('bussinessNameNotList') and conditionParamRef.bussinessNameNotList.size() > 0">
+            ${_conditionType_} a.bussinessName not in
+            <foreach collection="conditionParamRef.bussinessNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-
-            <if test="conditionParamRef.containsKey('indexCode')">
-                <if test="conditionParamRef.indexCode != null and conditionParamRef.indexCode != ''">
-                    ${_conditionType_} a.indexCode like #{${_conditionParam_}.indexCode}
-                </if>
-                <if test="conditionParamRef.indexCode == null">
-                    ${_conditionType_} a.indexCode is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('indexCodeList') and conditionParamRef.indexCodeList.size() > 0">
-                ${_conditionType_} a.indexCode in
-                <foreach collection="conditionParamRef.indexCodeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('appontmentNumber')">
+            <if test="conditionParamRef.appontmentNumber != null and conditionParamRef.appontmentNumber != ''">
+                ${_conditionType_} a.appontmentNumber like #{${_conditionParam_}.appontmentNumber}
             </if>
-            <if test="conditionParamRef.containsKey('indexCodeNotList') and conditionParamRef.indexCodeNotList.size() > 0">
-                ${_conditionType_} a.indexCode not in
-                <foreach collection="conditionParamRef.indexCodeNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.appontmentNumber == null">
+                ${_conditionType_} a.appontmentNumber is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('appontmentNumberList') and conditionParamRef.appontmentNumberList.size() > 0">
+            ${_conditionType_} a.appontmentNumber in
+            <foreach collection="conditionParamRef.appontmentNumberList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appontmentNumberNotList') and conditionParamRef.appontmentNumberNotList.size() > 0">
+            ${_conditionType_} a.appontmentNumber not in
+            <foreach collection="conditionParamRef.appontmentNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('ifaceGroupIndexCode')">
-                <if test="conditionParamRef.ifaceGroupIndexCode != null and conditionParamRef.ifaceGroupIndexCode != ''">
-                    ${_conditionType_} a.ifaceGroupIndexCode like #{${_conditionParam_}.ifaceGroupIndexCode}
-                </if>
-                <if test="conditionParamRef.ifaceGroupIndexCode == null">
-                    ${_conditionType_} a.ifaceGroupIndexCode is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('ifaceGroupIndexCodeList') and conditionParamRef.ifaceGroupIndexCodeList.size() > 0">
-                ${_conditionType_} a.ifaceGroupIndexCode in
-                <foreach collection="conditionParamRef.ifaceGroupIndexCodeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('ifaceGroupIndexCodeNotList') and conditionParamRef.ifaceGroupIndexCodeNotList.size() > 0">
-                ${_conditionType_} a.ifaceGroupIndexCode not in
-                <foreach collection="conditionParamRef.ifaceGroupIndexCodeNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('appointmentStartTime')">
+            <if test="conditionParamRef.appointmentStartTime != null ">
+                ${_conditionType_} a.appointmentStartTime = #{${_conditionParam_}.appointmentStartTime}
             </if>
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
+            <if test="conditionParamRef.appointmentStartTime == null">
+                ${_conditionType_} a.appointmentStartTime is null
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appointmentStartTimeStart') and conditionParamRef.appointmentStartTimeStart != null and conditionParamRef.appointmentStartTimeStart!=''">
+            ${_conditionType_} a.appointmentStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appointmentStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('appointmentStartTimeEnd') and conditionParamRef.appointmentStartTimeEnd != null and conditionParamRef.appointmentStartTimeEnd!=''">
+            ${_conditionType_} a.appointmentStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appointmentStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('appointmentEndTime')">
+            <if test="conditionParamRef.appointmentEndTime != null ">
+                ${_conditionType_} a.appointmentEndTime = #{${_conditionParam_}.appointmentEndTime}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
-                ${_conditionType_} a.createUserId not in
-                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.appointmentEndTime == null">
+                ${_conditionType_} a.appointmentEndTime is null
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('appointmentEndTimeStart') and conditionParamRef.appointmentEndTimeStart != null and conditionParamRef.appointmentEndTimeStart!=''">
+            ${_conditionType_} a.appointmentEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appointmentEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('appointmentEndTimeEnd') and conditionParamRef.appointmentEndTimeEnd != null and conditionParamRef.appointmentEndTimeEnd!=''">
+            ${_conditionType_} a.appointmentEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.appointmentEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+            ${_conditionType_} a.createUserId in
+            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+            ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
-                </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.createTime is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('updateUserId')">
-                <if test="conditionParamRef.updateUserId != null ">
-                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
-                </if>
-                <if test="conditionParamRef.updateUserId == null">
-                    ${_conditionType_} a.updateUserId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
-                ${_conditionType_} a.updateUserId in
-                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
-                ${_conditionType_} a.updateUserId not in
-                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserId')">
+            <if test="conditionParamRef.updateUserId != null ">
+                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            <if test="conditionParamRef.updateUserId == null">
+                ${_conditionType_} a.updateUserId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+            ${_conditionType_} a.updateUserId in
+            <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+            ${_conditionType_} a.updateUserId not in
+            <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteId')">
-                        a.siteId
-                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteName')">
-                        a.siteName
-                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('name')">
-                        a.name
-                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('idCard')">
-                        a.idCard
-                        <if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('gender')">
-                        a.gender
-                        <if test='orderCol.gender != null and "DESC".equalsIgnoreCase(orderCol.gender)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('phone')">
-                        a.phone
-                        <if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('birthday')">
-                        a.birthday
-                        <if test='orderCol.birthday != null and "DESC".equalsIgnoreCase(orderCol.birthday)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('address')">
-                        a.address
-                        <if test='orderCol.address != null and "DESC".equalsIgnoreCase(orderCol.address)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('photo')">
-                        a.photo
-                        <if test='orderCol.photo != null and "DESC".equalsIgnoreCase(orderCol.photo)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('remark')">
-                        a.remark
-                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('source')">
-                        a.source
-                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('inFaceHk')">
-                        a.inFaceHk
-                        <if test='orderCol.inFaceHk != null and "DESC".equalsIgnoreCase(orderCol.inFaceHk)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('indexCode')">
-                        a.indexCode
-                        <if test='orderCol.indexCode != null and "DESC".equalsIgnoreCase(orderCol.indexCode)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('ifaceGroupIndexCode')">
-                        a.ifaceGroupIndexCode
-                        <if test='orderCol.ifaceGroupIndexCode != null and "DESC".equalsIgnoreCase(orderCol.ifaceGroupIndexCode)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.createUserId
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.createTime
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateUserId')">
-                        a.updateUserId
-                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateTime')">
-                        a.updateTime
-                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                        ,
-                    </if>
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteName')">
+                    a.siteName
+                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('personId')">
+                    a.personId
+                    <if test='orderCol.personId != null and "DESC".equalsIgnoreCase(orderCol.personId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('name')">
+                    a.name
+                    <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('contactInfo')">
+                    a.contactInfo
+                    <if test='orderCol.contactInfo != null and "DESC".equalsIgnoreCase(orderCol.contactInfo)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('idCard')">
+                    a.idCard
+                    <if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('bussinessId')">
+                    a.bussinessId
+                    <if test='orderCol.bussinessId != null and "DESC".equalsIgnoreCase(orderCol.bussinessId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('bussinessName')">
+                    a.bussinessName
+                    <if test='orderCol.bussinessName != null and "DESC".equalsIgnoreCase(orderCol.bussinessName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appontmentNumber')">
+                    a.appontmentNumber
+                    <if test='orderCol.appontmentNumber != null and "DESC".equalsIgnoreCase(orderCol.appontmentNumber)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appointmentStartTime')">
+                    a.appointmentStartTime
+                    <if test='orderCol.appointmentStartTime != null and "DESC".equalsIgnoreCase(orderCol.appointmentStartTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appointmentEndTime')">
+                    a.appointmentEndTime
+                    <if test='orderCol.appointmentEndTime != null and "DESC".equalsIgnoreCase(orderCol.appointmentEndTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserId')">
+                    a.createUserId
+                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateUserId')">
+                    a.updateUserId
+                    <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

refined-manager/src/test/java/com/mortals/httpclient/appointment/AppointmentPersonController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###预约人员记录列表
+POST {{baseUrl}}/appointment/person/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###预约人员记录更新与保存
+POST {{baseUrl}}/appointment/person/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "siteId":841,
+        "siteName":"exbn83",
+        "personId":452,
+        "name":"rgqtai",
+        "contactInfo":"rx8lt9",
+        "idNumber":"z8djwa",
+        "reservationService":"x1vgyl",
+        "reservationNumber":"7im1er",
+        "appointmentTime":"1681574400000",
+}
+
+> {%
+client.global.set("AppointmentPerson_id", JSON.parse(response.body).data.id);
+%}
+
+###预约人员记录查看
+GET {{baseUrl}}/appointment/person/info?id={{AppointmentPerson_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###预约人员记录编辑
+GET {{baseUrl}}/appointment/person/edit?id={{AppointmentPerson_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###预约人员记录删除
+GET {{baseUrl}}/appointment/person/delete?id={{AppointmentPerson_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+