Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/add.sql

@@ -242,3 +242,107 @@ UPDATE mortals_sys_skin_base SET imageResolution="1280x1280" WHERE imageResoluti
 2024-03-08
 -- ----------------------------
 ALTER TABLE mortals_sys_site_matter ADD COLUMN   `hallCheckIn` tinyint(2)    DEFAULT '0'  COMMENT '大厅事项入驻(0.否,1.是)'  AFTER agentPost;
+
+
+-- ----------------------------
+2024-04-08
+-- ----------------------------
+-- ----------------------------
+-- 排号汇总表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_ph_queue`;
+CREATE TABLE mortals_xhx_ph_queue(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `ordernumber` varchar(64) NOT NULL     COMMENT '预约编号，为空现场取号',
+    `style` char(8) NOT NULL   DEFAULT '未叫号'  COMMENT '叫号状态 (未叫号,叫号中,完成)',
+    `business` varchar(128) NOT NULL     COMMENT '业务名',
+    `window_name` varchar(128) NOT NULL     COMMENT '窗口名',
+    `window_fromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
+    `flownum` varchar(64) NOT NULL     COMMENT '流水编号,当天的第xxx号',
+    `formernum` varchar(32) NOT NULL     COMMENT '呼叫转移号',
+    `people_idcard` varchar(64) NOT NULL     COMMENT '身份证号',
+    `people_name` varchar(64) NOT NULL     COMMENT '姓名',
+    `people_sex` char(6) NOT NULL     COMMENT '性别',
+    `people_phone` varchar(20) NOT NULL     COMMENT '手机号',
+    `workman_name` varchar(32) NOT NULL     COMMENT '工作人员姓名',
+    `workman_number` varchar(20) NOT NULL     COMMENT '工作人员工号',
+    `taketime` datetime      COMMENT '取号时间',
+    `calltime` datetime      COMMENT '叫号时间',
+    `endtime` datetime      COMMENT '结束时间',
+    `wait_time` int(9) NOT NULL   DEFAULT '0'  COMMENT '等待时间,单位s',
+    `handle_time` int(9) NOT NULL   DEFAULT '0'  COMMENT '办理时间,单位s',
+    `device_name` varchar(128) NOT NULL     COMMENT '取号设备名',
+    `call_name` varchar(128) NOT NULL     COMMENT '呼叫设备',
+    `matter_name` varchar(256) NOT NULL     COMMENT '事项名',
+    `queueid` varchar(128) NOT NULL     COMMENT '排号队列ID，唯一',
+    `wy_signin` varchar(16) NOT NULL   DEFAULT '现场取号'  COMMENT '取号方式 (现场取号,微信取号)',
+    `section_name` varchar(128) NOT NULL     COMMENT '部门名称',
+    `hall_name` varchar(128) NOT NULL     COMMENT '大厅名称',
+    `device_type` varchar(32) NOT NULL   DEFAULT '排号机'  COMMENT '取号设备类型',
+    `site_id` bigint(20) NOT NULL   DEFAULT '0'  COMMENT '站点Id',
+    `site_code` varchar(128) NOT NULL     COMMENT '站点编码',
+    `site_name` varchar(128)      COMMENT '站点名称',
+    `ext_num` varchar(128) NOT NULL     COMMENT '扩展编号',
+    `create_user_id` bigint(20)      COMMENT '创建用户',
+    `create_time` datetime NOT NULL     COMMENT '创建时间',
+    `update_time` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+,KEY `style` (`style`) USING BTREE
+,KEY `business` (`business`) USING BTREE
+,KEY `window_fromnum` (`window_fromnum`) USING BTREE
+,KEY `people_idcard` (`people_idcard`) USING BTREE
+,KEY `people_phone` (`people_phone`) USING BTREE
+,KEY `workman_number` (`workman_number`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='排号汇总';
+
+-- ----------------------------
+-- 评价汇总表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_pj_evaluate`;
+CREATE TABLE mortals_xhx_pj_evaluate(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `people_idcard` varchar(64) NOT NULL     COMMENT '评价人身份证号',
+    `people_name` varchar(64) NOT NULL     COMMENT '评价人姓名',
+    `people_sex` char(6) NOT NULL     COMMENT '评价人性别',
+    `people_phone` varchar(20) NOT NULL     COMMENT '评价人手机号',
+    `pj_option` varchar(32) NOT NULL     COMMENT '评价选项(非常满意,满意,基本满意,不满意,非常不满意)',
+    `content_tag` varchar(255) NOT NULL     COMMENT '评价标签',
+    `pic_url` varchar(128) NOT NULL     COMMENT '评价人图片地址',
+    `section_name` varchar(128) NOT NULL     COMMENT '部门',
+    `hall_name` varchar(128) NOT NULL     COMMENT '大厅',
+    `pj_source` varchar(20) NOT NULL     COMMENT '评价来源 (安卓,导视机,微信)',
+    `opinion` varchar(512)      COMMENT '手输意见',
+    `window_name` varchar(128) NOT NULL     COMMENT '窗口名',
+    `window_fromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
+    `flounum` varchar(20)      COMMENT '排号编号',
+    `pjxt` varchar(32)    DEFAULT '窗口评价'  COMMENT '窗口评价(自助服务终端,背靠背评价,微官网)',
+    `workman_name` varchar(32) NOT NULL     COMMENT '工作人员姓名',
+    `workman_number` varchar(20) NOT NULL     COMMENT '工作人员工号',
+    `devicenum` varchar(64)      COMMENT '评价器mac',
+    `evaluatestatus` varchar(32)    DEFAULT '等待评价'  COMMENT '评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名',
+    `evaluatetype` char(8)    DEFAULT '截图'  COMMENT '截图还是评价 (截图,评价)',
+    `photobefor` varchar(256) NOT NULL     COMMENT '截图地址',
+    `photoautograph` varchar(256)      COMMENT '签字图片',
+    `picture` varchar(256) NOT NULL     COMMENT '抓拍评价人照片',
+    `process` varchar(256) NOT NULL     COMMENT '音频视频地址',
+    `eyevaluate` varchar(16)    DEFAULT '未标记'  COMMENT '评价标记（未标记,标记非恶意差评,标记恶意差评)',
+    `pj_type` varchar(16) NOT NULL   DEFAULT '窗口评价'  COMMENT '评价指向 (窗口评价,部门评价,排号评价)',
+    `pj_time` datetime      COMMENT '评价时间',
+    `site_id` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
+    `site_code` varchar(128)      COMMENT '站点编码',
+    `site_name` varchar(128)      COMMENT '站点名称',
+    `ext_num` varchar(128)      COMMENT '扩展编号',
+    `create_user_id` bigint(20)      COMMENT '创建用户',
+    `create_time` datetime NOT NULL     COMMENT '创建时间',
+    `update_time` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+,KEY `people_idcard` (`people_idcard`) USING BTREE
+,KEY `people_phone` (`people_phone`) USING BTREE
+,KEY `pj_option` (`pj_option`) USING BTREE
+,KEY `pj_source` (`pj_source`) USING BTREE
+,KEY `site_id` (`site_id`) USING BTREE
+,KEY `site_code` (`site_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='评价汇总';
+
+
+

base-manager/src/main/java/com/mortals/xhx/base/framework/CustomJsonDateDeserializer.java

+package com.mortals.xhx.base.framework;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.springframework.util.ObjectUtils;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author: zxfei
+ * @date: 2022/6/30 10:49
+ * @description:
+ **/
+public class CustomJsonDateDeserializer extends JsonDeserializer<Date> {
+
+    @Override
+    public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = jp.getText();
+
+        if (!ObjectUtils.isEmpty(date)) {
+            try {
+                return format.parse(date);
+            } catch (ParseException e) {
+                return null;
+            }
+        } else {
+            return null;
+        }
+
+
+    }
+}

base-manager/src/main/java/com/mortals/xhx/base/framework/DateJacksonConverter.java

+package com.mortals.xhx.base.framework;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Date;
+
+/**
+ * 自定义Jackson反序列化日期类型时应用的类型转换器,一般用于@RequestBody接受参数时使用
+ */
+public class DateJacksonConverter extends JsonDeserializer {
+
+    private static String[] pattern = new String[]{"yyyy-MM-dd", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.S", "yyyy.MM.dd", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm:ss.S", "yyyy/MM/dd", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm:ss.S"};
+
+    @Override
+    public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+        Date targetDate = null;
+        String originDate = p.getText();
+        if (StringUtils.isNotEmpty(originDate)) {
+            try {
+                long longDate = Long.valueOf(originDate.trim());
+                targetDate = new Date(longDate);
+            } catch (NumberFormatException e) {
+                try {
+                    targetDate = DateUtils.parseDate(originDate, DateJacksonConverter.pattern);
+                } catch (ParseException pe) {
+                    throw new IOException(String.format("'%s' can not convert to type 'java.util.Date',just support timestamp(type of long) and following date format(%s)",
+                            originDate,
+                            StringUtils.join(pattern, ",")));
+                }
+            }
+        }
+        return targetDate;
+    }
+
+    @Override
+    public Class handledType() {
+        return Date.class;
+    }
+}

base-manager/src/main/java/com/mortals/xhx/base/framework/WxMessageConverter.java

+package com.mortals.xhx.base.framework;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author: zxfei
+ * @date: 2022/6/28 15:57
+ * @description:
+ **/
+// 创建一个新的转换器 解析微信的 [text/plain]
+public class WxMessageConverter extends MappingJackson2HttpMessageConverter {
+    public WxMessageConverter() {
+        List<MediaType> mediaTypes = new ArrayList<>();
+        mediaTypes.add(MediaType.TEXT_PLAIN);
+        setSupportedMediaTypes(mediaTypes);
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/framework/config/ConverterConfig.java

+package com.mortals.xhx.base.framework.config;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mortals.xhx.base.framework.DateJacksonConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+@Configuration
+public class ConverterConfig {
+    @Bean
+    public DateJacksonConverter dateJacksonConverter() {
+        return new DateJacksonConverter();
+    }
+
+    @Bean
+    public Jackson2ObjectMapperFactoryBean jackson2ObjectMapperFactoryBean(DateJacksonConverter dateJacksonConverter) {
+        Jackson2ObjectMapperFactoryBean jackson2ObjectMapperFactoryBean = new Jackson2ObjectMapperFactoryBean();
+        jackson2ObjectMapperFactoryBean.setDeserializers(dateJacksonConverter);
+        return jackson2ObjectMapperFactoryBean;
+    }
+
+    @Bean
+    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) {
+        MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
+        mappingJackson2HttpMessageConverter.setObjectMapper(objectMapper);
+        return mappingJackson2HttpMessageConverter;
+    }
+}

base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

 package com.mortals.xhx.base.login.web;
 
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.ap.CookieService;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.ITokenService;
@@ -20,7 +24,10 @@ import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.base.system.valid.service.ValidCodeService;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.feign.user.IUserFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -33,6 +40,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @RestController
@@ -50,6 +58,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     private ICacheService cacheService;
     @Autowired
     private IAuthTokenService authTokenService;
+    @Autowired
+    private IUserFeign userFeign;
 
     private static Log logger = LogFactory.getLog(LoginController.class);
 
@@ -124,6 +134,27 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         }
     }
 
+
+    @RequestMapping("getToken")
+    @UnAuth
+    public Rest<String> getToken(@RequestBody LoginForm loginForm){
+        String loginName = loginForm.getLoginName();
+        String password = loginForm.getPassword();
+        UserPdu userPdu = new UserPdu();
+        userPdu.setLoginName(loginName);
+        userPdu.setPassword(password);
+        userPdu.setSecurityCode("admin");
+        String resp = userFeign.portalLogin(userPdu);
+        Rest<Map<String, String>> rest = JSON.parseObject(resp, new TypeReference<Rest<Map<String, String>>>() {
+        });
+        if (rest.getCode() == YesNoEnum.YES.getValue()) {
+            String token = rest.getData().getOrDefault("token", "");
+            return Rest.ok("获取TOKEN成功", token);
+        } else {
+            return Rest.fail(rest.getMsg());
+        }
+    }
+
     @RequestMapping("logout")
     public void logout(HttpServletRequest request, HttpServletResponse response) throws Exception {
         recordSysLog(request, "退出登录");

base-manager/src/main/java/com/mortals/xhx/common/code/EvaluatetypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 截图还是评价 (截图.截图,评价.评价)枚举类
+*
+* @author zxfei
+*/
+public enum EvaluatetypeEnum {
+    截图("截图", "截图"),
+    评价("评价", "评价");
+    private String value;
+    private String desc;
+
+    EvaluatetypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static EvaluatetypeEnum getByValue(String value) {
+        for (EvaluatetypeEnum evaluatetypeEnum : EvaluatetypeEnum.values()) {
+            if (evaluatetypeEnum.getValue() == value) {
+                return evaluatetypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (EvaluatetypeEnum item : EvaluatetypeEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/OptionEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 评价选项(非常满意,满意,基本满意,不满意,非常不满意)枚举类
+*
+* @author zxfei
+*/
+public enum OptionEnum {
+    非常满意("非常满意", "非常满意"),
+    满意("满意", "满意"),
+    基本满意("基本满意", "基本满意"),
+    不满意("不满意", "不满意"),
+    非常不满意("非常不满意", "非常不满意");
+    private String value;
+    private String desc;
+
+    OptionEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static OptionEnum getByValue(String value) {
+        for (OptionEnum optionEnum : OptionEnum.values()) {
+            if (optionEnum.getValue() == value) {
+                return optionEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (OptionEnum item : OptionEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/Pj_optionEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 评价选项(非常满意,满意,基本满意,不满意,非常不满意)枚举类
+*
+* @author zxfei
+*/
+public enum Pj_optionEnum {
+    非常满意("非常满意", "非常满意"),
+    满意("满意", "满意"),
+    基本满意("基本满意", "基本满意"),
+    不满意("不满意", "不满意"),
+    非常不满意("非常不满意", "非常不满意");
+    private String value;
+    private String desc;
+
+    Pj_optionEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static Pj_optionEnum getByValue(String value) {
+        for (Pj_optionEnum pj_optionEnum : Pj_optionEnum.values()) {
+            if (pj_optionEnum.getValue() == value) {
+                return pj_optionEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (Pj_optionEnum item : Pj_optionEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/Pj_sourceEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 评价来源 (安卓,导视机,微信)枚举类
+*
+* @author zxfei
+*/
+public enum Pj_sourceEnum {
+    安卓("安卓", "安卓"),
+    导视机("导视机", "导视机"),
+    微信("微信", "微信");
+    private String value;
+    private String desc;
+
+    Pj_sourceEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static Pj_sourceEnum getByValue(String value) {
+        for (Pj_sourceEnum pj_sourceEnum : Pj_sourceEnum.values()) {
+            if (pj_sourceEnum.getValue() == value) {
+                return pj_sourceEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (Pj_sourceEnum item : Pj_sourceEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/Pj_typeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 评价指向 (窗口评价,部门评价,排号评价)枚举类
+*
+* @author zxfei
+*/
+public enum Pj_typeEnum {
+    窗口评价("窗口评价", "窗口评价"),
+    部门评价("部门评价", "部门评价"),
+    排号评价("排号评价", "排号评价");
+    private String value;
+    private String desc;
+
+    Pj_typeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static Pj_typeEnum getByValue(String value) {
+        for (Pj_typeEnum pj_typeEnum : Pj_typeEnum.values()) {
+            if (pj_typeEnum.getValue() == value) {
+                return pj_typeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (Pj_typeEnum item : Pj_typeEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/PjxtEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 窗口评价(自助服务终端,背靠背评价,微官网)枚举类
+*
+* @author zxfei
+*/
+public enum PjxtEnum {
+    自助服务终端("自助服务终端", "自助服务终端"),
+    背靠背评价("背靠背评价", "背靠背评价"),
+    微官网("微官网", "微官网");
+    private String value;
+    private String desc;
+
+    PjxtEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static PjxtEnum getByValue(String value) {
+        for (PjxtEnum pjxtEnum : PjxtEnum.values()) {
+            if (pjxtEnum.getValue() == value) {
+                return pjxtEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (PjxtEnum item : PjxtEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/StyleEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 叫号状态 (未叫号,叫号中,完成)枚举类
+*
+* @author zxfei
+*/
+public enum StyleEnum {
+    未叫号("未叫号", "未叫号"),
+    叫号中("叫号中", "叫号中"),
+    完成("完成", "完成");
+    private String value;
+    private String desc;
+
+    StyleEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static StyleEnum getByValue(String value) {
+        for (StyleEnum styleEnum : StyleEnum.values()) {
+            if (styleEnum.getValue() == value) {
+                return styleEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (StyleEnum item : StyleEnum.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

base-manager/src/main/java/com/mortals/xhx/common/code/Wy_signinEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 取号方式 (现场取号,微信取号)枚举类
+*
+* @author zxfei
+*/
+public enum Wy_signinEnum {
+    现场取号("现场取号", "现场取号"),
+    微信取号("微信取号", "微信取号");
+    private String value;
+    private String desc;
+
+    Wy_signinEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static Wy_signinEnum getByValue(String value) {
+        for (Wy_signinEnum wy_signinEnum : Wy_signinEnum.values()) {
+            if (wy_signinEnum.getValue() == value) {
+                return wy_signinEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (Wy_signinEnum item : Wy_signinEnum.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

base-manager/src/main/java/com/mortals/xhx/module/ph/dao/PhQueueDao.java

+package com.mortals.xhx.module.ph.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+import java.util.List;
+/**
+* 排号汇总Dao
+* 排号汇总 DAO接口
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+
+public interface  PhQueueDao extends ICRUDDao<PhQueueEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/ph/dao/ibatis/PhQueueDaoImpl.java

+package com.mortals.xhx.module.ph.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.ph.dao.PhQueueDao;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 排号汇总DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Repository("phQueueDao")
+public class PhQueueDaoImpl extends BaseCRUDDaoMybatis<PhQueueEntity,Long> implements PhQueueDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/ph/model/PhQueueEntity.java

+package com.mortals.xhx.module.ph.model;
+
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+import cn.hutool.core.date.DateUtil;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.ph.model.vo.PhQueueVo;
+import lombok.Data;
+
+/**
+ * 排号汇总实体对象
+ *
+ * @author zxfei
+ * @date 2024-04-09
+ */
+@Data
+public class PhQueueEntity extends PhQueueVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 预约编号，为空现场取号
+     */
+    private String ordernumber;
+    /**
+     * 叫号状态 (未叫号,叫号中,完成)
+     */
+    private String style;
+    /**
+     * 业务名
+     */
+    private String business;
+    /**
+     * 窗口名
+     */
+    private String windowName;
+    /**
+     * 窗口编号
+     */
+    private String windowFromnum;
+    /**
+     * 流水编号,当天的第xxx号
+     */
+    private String flownum;
+    /**
+     * 呼叫转移号
+     */
+    private String formernum;
+    /**
+     * 身份证号
+     */
+    private String peopleIdcard;
+    /**
+     * 姓名
+     */
+    private String peopleName;
+    /**
+     * 性别
+     */
+    private String peopleSex;
+    /**
+     * 手机号
+     */
+    private String peoplePhone;
+    /**
+     * 工作人员姓名
+     */
+    private String workmanName;
+    /**
+     * 工作人员工号
+     */
+    private String workmanNumber;
+    /**
+     * 取号时间
+     */
+    private Date taketime;
+    /**
+     * 叫号时间
+     */
+    private Date calltime;
+    /**
+     * 结束时间
+     */
+    private Date endtime;
+    /**
+     * 等待时间,单位s
+     */
+    private Integer waitTime;
+    /**
+     * 办理时间,单位s
+     */
+    private Integer handleTime;
+    /**
+     * 取号设备名
+     */
+    private String deviceName;
+    /**
+     * 呼叫设备
+     */
+    private String callName;
+    /**
+     * 事项名
+     */
+    private String matterName;
+    /**
+     * 排号队列ID，唯一
+     */
+    private String queueid;
+    /**
+     * 取号方式 (现场取号,微信取号)
+     */
+    private String wySignin;
+    /**
+     * 部门名称
+     */
+    private String sectionName;
+    /**
+     * 大厅名称
+     */
+    private String hallName;
+    /**
+     * 取号设备类型
+     */
+    private String deviceType;
+    /**
+     * 站点Id
+     */
+    private Long siteId;
+    /**
+     * 站点编码
+     */
+    private String siteCode;
+    /**
+     * 站点名称
+     */
+    private String siteName;
+    /**
+     * 扩展编号
+     */
+    private String extNum;
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof PhQueueEntity) {
+            PhQueueEntity tmp = (PhQueueEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue() {
+        this.ordernumber = "";
+        this.style = "未叫号";
+        this.business = "";
+        this.windowName = "";
+        this.windowFromnum = "";
+        this.flownum = "";
+        this.formernum = "";
+        this.peopleIdcard = "";
+        this.peopleName = "";
+        this.peopleSex = "";
+        this.peoplePhone = "";
+        this.workmanName = "";
+        this.workmanNumber = "";
+        this.taketime = null;
+        this.calltime = null;
+        this.endtime = null;
+        this.waitTime = 0;
+        this.handleTime = 0;
+        this.deviceName = "";
+        this.callName = "";
+        this.matterName = "";
+        this.queueid = "";
+        this.wySignin = "现场取号";
+        this.sectionName = "";
+        this.hallName = "";
+        this.deviceType = "排号机";
+        this.siteId = 0L;
+        this.siteCode = "";
+        this.siteName = "";
+        this.extNum = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/ph/model/PhQueueQuery.java

+package com.mortals.xhx.module.ph.model;
+
+import java.util.Date;
+import java.util.List;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+/**
+* 排号汇总查询对象
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+public class PhQueueQuery extends PhQueueEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 预约编号，为空现场取号 */
+    private List<String> ordernumberList;
+
+    /** 预约编号，为空现场取号排除列表 */
+    private List <String> ordernumberNotList;
+    /** 叫号状态 (未叫号,叫号中,完成) */
+    private List<String> styleList;
+
+    /** 叫号状态 (未叫号,叫号中,完成)排除列表 */
+    private List <String> styleNotList;
+    /** 业务名 */
+    private List<String> businessList;
+
+    /** 业务名排除列表 */
+    private List <String> businessNotList;
+    /** 窗口名 */
+    private List<String> windowNameList;
+
+    /** 窗口名排除列表 */
+    private List <String> windowNameNotList;
+    /** 窗口编号 */
+    private List<String> windowFromnumList;
+
+    /** 窗口编号排除列表 */
+    private List <String> windowFromnumNotList;
+    /** 流水编号,当天的第xxx号 */
+    private List<String> flownumList;
+
+    /** 流水编号,当天的第xxx号排除列表 */
+    private List <String> flownumNotList;
+    /** 呼叫转移号 */
+    private List<String> formernumList;
+
+    /** 呼叫转移号排除列表 */
+    private List <String> formernumNotList;
+    /** 身份证号 */
+    private List<String> peopleIdcardList;
+
+    /** 身份证号排除列表 */
+    private List <String> peopleIdcardNotList;
+    /** 姓名 */
+    private List<String> peopleNameList;
+
+    /** 姓名排除列表 */
+    private List <String> peopleNameNotList;
+    /** 性别 */
+    private List<String> peopleSexList;
+
+    /** 性别排除列表 */
+    private List <String> peopleSexNotList;
+    /** 手机号 */
+    private List<String> peoplePhoneList;
+
+    /** 手机号排除列表 */
+    private List <String> peoplePhoneNotList;
+    /** 工作人员姓名 */
+    private List<String> workmanNameList;
+
+    /** 工作人员姓名排除列表 */
+    private List <String> workmanNameNotList;
+    /** 工作人员工号 */
+    private List<String> workmanNumberList;
+
+    /** 工作人员工号排除列表 */
+    private List <String> workmanNumberNotList;
+    /** 开始 取号时间 */
+    private String taketimeStart;
+
+    /** 结束 取号时间 */
+    private String taketimeEnd;
+
+    /** 开始 叫号时间 */
+    private String calltimeStart;
+
+    /** 结束 叫号时间 */
+    private String calltimeEnd;
+
+    /** 开始 结束时间 */
+    private String endtimeStart;
+
+    /** 结束 结束时间 */
+    private String endtimeEnd;
+
+    /** 开始 等待时间,单位s */
+    private Integer waitTimeStart;
+
+    /** 结束 等待时间,单位s */
+    private Integer waitTimeEnd;
+
+    /** 增加 等待时间,单位s */
+    private Integer waitTimeIncrement;
+
+    /** 等待时间,单位s列表 */
+    private List <Integer> waitTimeList;
+
+    /** 等待时间,单位s排除列表 */
+    private List <Integer> waitTimeNotList;
+
+    /** 开始 办理时间,单位s */
+    private Integer handleTimeStart;
+
+    /** 结束 办理时间,单位s */
+    private Integer handleTimeEnd;
+
+    /** 增加 办理时间,单位s */
+    private Integer handleTimeIncrement;
+
+    /** 办理时间,单位s列表 */
+    private List <Integer> handleTimeList;
+
+    /** 办理时间,单位s排除列表 */
+    private List <Integer> handleTimeNotList;
+
+    /** 取号设备名 */
+    private List<String> deviceNameList;
+
+    /** 取号设备名排除列表 */
+    private List <String> deviceNameNotList;
+    /** 呼叫设备 */
+    private List<String> callNameList;
+
+    /** 呼叫设备排除列表 */
+    private List <String> callNameNotList;
+    /** 事项名 */
+    private List<String> matterNameList;
+
+    /** 事项名排除列表 */
+    private List <String> matterNameNotList;
+    /** 排号队列ID，唯一 */
+    private List<String> queueidList;
+
+    /** 排号队列ID，唯一排除列表 */
+    private List <String> queueidNotList;
+    /** 取号方式 (现场取号,微信取号) */
+    private List<String> wySigninList;
+
+    /** 取号方式 (现场取号,微信取号)排除列表 */
+    private List <String> wySigninNotList;
+    /** 部门名称 */
+    private List<String> sectionNameList;
+
+    /** 部门名称排除列表 */
+    private List <String> sectionNameNotList;
+    /** 大厅名称 */
+    private List<String> hallNameList;
+
+    /** 大厅名称排除列表 */
+    private List <String> hallNameNotList;
+    /** 取号设备类型 */
+    private List<String> deviceTypeList;
+
+    /** 取号设备类型排除列表 */
+    private List <String> deviceTypeNotList;
+    /** 开始 站点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> siteCodeList;
+
+    /** 站点编码排除列表 */
+    private List <String> siteCodeNotList;
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 扩展编号 */
+    private List<String> extNumList;
+
+    /** 扩展编号排除列表 */
+    private List <String> extNumNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新时间 */
+    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<PhQueueQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<PhQueueQuery> andConditionList;
+
+    public PhQueueQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 预约编号，为空现场取号
+    * @return ordernumberList
+    */
+    public List<String> getOrdernumberList(){
+        return this.ordernumberList;
+    }
+
+    /**
+    * 设置 预约编号，为空现场取号
+    * @param ordernumberList
+    */
+    public void setOrdernumberList(List<String> ordernumberList){
+        this.ordernumberList = ordernumberList;
+    }
+
+    /**
+    * 获取 预约编号，为空现场取号
+    * @return ordernumberNotList
+    */
+    public List<String> getOrdernumberNotList(){
+        return this.ordernumberNotList;
+    }
+
+    /**
+    * 设置 预约编号，为空现场取号
+    * @param ordernumberNotList
+    */
+    public void setOrdernumberNotList(List<String> ordernumberNotList){
+        this.ordernumberNotList = ordernumberNotList;
+    }
+
+    /**
+    * 获取 叫号状态 (未叫号,叫号中,完成)
+    * @return styleList
+    */
+    public List<String> getStyleList(){
+        return this.styleList;
+    }
+
+    /**
+    * 设置 叫号状态 (未叫号,叫号中,完成)
+    * @param styleList
+    */
+    public void setStyleList(List<String> styleList){
+        this.styleList = styleList;
+    }
+
+    /**
+    * 获取 叫号状态 (未叫号,叫号中,完成)
+    * @return styleNotList
+    */
+    public List<String> getStyleNotList(){
+        return this.styleNotList;
+    }
+
+    /**
+    * 设置 叫号状态 (未叫号,叫号中,完成)
+    * @param styleNotList
+    */
+    public void setStyleNotList(List<String> styleNotList){
+        this.styleNotList = styleNotList;
+    }
+
+    /**
+    * 获取 业务名
+    * @return businessList
+    */
+    public List<String> getBusinessList(){
+        return this.businessList;
+    }
+
+    /**
+    * 设置 业务名
+    * @param businessList
+    */
+    public void setBusinessList(List<String> businessList){
+        this.businessList = businessList;
+    }
+
+    /**
+    * 获取 业务名
+    * @return businessNotList
+    */
+    public List<String> getBusinessNotList(){
+        return this.businessNotList;
+    }
+
+    /**
+    * 设置 业务名
+    * @param businessNotList
+    */
+    public void setBusinessNotList(List<String> businessNotList){
+        this.businessNotList = businessNotList;
+    }
+
+    /**
+    * 获取 窗口名
+    * @return windowNameList
+    */
+    public List<String> getWindowNameList(){
+        return this.windowNameList;
+    }
+
+    /**
+    * 设置 窗口名
+    * @param windowNameList
+    */
+    public void setWindowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+    }
+
+    /**
+    * 获取 窗口名
+    * @return windowNameNotList
+    */
+    public List<String> getWindowNameNotList(){
+        return this.windowNameNotList;
+    }
+
+    /**
+    * 设置 窗口名
+    * @param windowNameNotList
+    */
+    public void setWindowNameNotList(List<String> windowNameNotList){
+        this.windowNameNotList = windowNameNotList;
+    }
+
+    /**
+    * 获取 窗口编号
+    * @return windowFromnumList
+    */
+    public List<String> getWindowFromnumList(){
+        return this.windowFromnumList;
+    }
+
+    /**
+    * 设置 窗口编号
+    * @param windowFromnumList
+    */
+    public void setWindowFromnumList(List<String> windowFromnumList){
+        this.windowFromnumList = windowFromnumList;
+    }
+
+    /**
+    * 获取 窗口编号
+    * @return windowFromnumNotList
+    */
+    public List<String> getWindowFromnumNotList(){
+        return this.windowFromnumNotList;
+    }
+
+    /**
+    * 设置 窗口编号
+    * @param windowFromnumNotList
+    */
+    public void setWindowFromnumNotList(List<String> windowFromnumNotList){
+        this.windowFromnumNotList = windowFromnumNotList;
+    }
+
+    /**
+    * 获取 流水编号,当天的第xxx号
+    * @return flownumList
+    */
+    public List<String> getFlownumList(){
+        return this.flownumList;
+    }
+
+    /**
+    * 设置 流水编号,当天的第xxx号
+    * @param flownumList
+    */
+    public void setFlownumList(List<String> flownumList){
+        this.flownumList = flownumList;
+    }
+
+    /**
+    * 获取 流水编号,当天的第xxx号
+    * @return flownumNotList
+    */
+    public List<String> getFlownumNotList(){
+        return this.flownumNotList;
+    }
+
+    /**
+    * 设置 流水编号,当天的第xxx号
+    * @param flownumNotList
+    */
+    public void setFlownumNotList(List<String> flownumNotList){
+        this.flownumNotList = flownumNotList;
+    }
+
+    /**
+    * 获取 呼叫转移号
+    * @return formernumList
+    */
+    public List<String> getFormernumList(){
+        return this.formernumList;
+    }
+
+    /**
+    * 设置 呼叫转移号
+    * @param formernumList
+    */
+    public void setFormernumList(List<String> formernumList){
+        this.formernumList = formernumList;
+    }
+
+    /**
+    * 获取 呼叫转移号
+    * @return formernumNotList
+    */
+    public List<String> getFormernumNotList(){
+        return this.formernumNotList;
+    }
+
+    /**
+    * 设置 呼叫转移号
+    * @param formernumNotList
+    */
+    public void setFormernumNotList(List<String> formernumNotList){
+        this.formernumNotList = formernumNotList;
+    }
+
+    /**
+    * 获取 身份证号
+    * @return peopleIdcardList
+    */
+    public List<String> getPeopleIdcardList(){
+        return this.peopleIdcardList;
+    }
+
+    /**
+    * 设置 身份证号
+    * @param peopleIdcardList
+    */
+    public void setPeopleIdcardList(List<String> peopleIdcardList){
+        this.peopleIdcardList = peopleIdcardList;
+    }
+
+    /**
+    * 获取 身份证号
+    * @return peopleIdcardNotList
+    */
+    public List<String> getPeopleIdcardNotList(){
+        return this.peopleIdcardNotList;
+    }
+
+    /**
+    * 设置 身份证号
+    * @param peopleIdcardNotList
+    */
+    public void setPeopleIdcardNotList(List<String> peopleIdcardNotList){
+        this.peopleIdcardNotList = peopleIdcardNotList;
+    }
+
+    /**
+    * 获取 姓名
+    * @return peopleNameList
+    */
+    public List<String> getPeopleNameList(){
+        return this.peopleNameList;
+    }
+
+    /**
+    * 设置 姓名
+    * @param peopleNameList
+    */
+    public void setPeopleNameList(List<String> peopleNameList){
+        this.peopleNameList = peopleNameList;
+    }
+
+    /**
+    * 获取 姓名
+    * @return peopleNameNotList
+    */
+    public List<String> getPeopleNameNotList(){
+        return this.peopleNameNotList;
+    }
+
+    /**
+    * 设置 姓名
+    * @param peopleNameNotList
+    */
+    public void setPeopleNameNotList(List<String> peopleNameNotList){
+        this.peopleNameNotList = peopleNameNotList;
+    }
+
+    /**
+    * 获取 性别
+    * @return peopleSexList
+    */
+    public List<String> getPeopleSexList(){
+        return this.peopleSexList;
+    }
+
+    /**
+    * 设置 性别
+    * @param peopleSexList
+    */
+    public void setPeopleSexList(List<String> peopleSexList){
+        this.peopleSexList = peopleSexList;
+    }
+
+    /**
+    * 获取 性别
+    * @return peopleSexNotList
+    */
+    public List<String> getPeopleSexNotList(){
+        return this.peopleSexNotList;
+    }
+
+    /**
+    * 设置 性别
+    * @param peopleSexNotList
+    */
+    public void setPeopleSexNotList(List<String> peopleSexNotList){
+        this.peopleSexNotList = peopleSexNotList;
+    }
+
+    /**
+    * 获取 手机号
+    * @return peoplePhoneList
+    */
+    public List<String> getPeoplePhoneList(){
+        return this.peoplePhoneList;
+    }
+
+    /**
+    * 设置 手机号
+    * @param peoplePhoneList
+    */
+    public void setPeoplePhoneList(List<String> peoplePhoneList){
+        this.peoplePhoneList = peoplePhoneList;
+    }
+
+    /**
+    * 获取 手机号
+    * @return peoplePhoneNotList
+    */
+    public List<String> getPeoplePhoneNotList(){
+        return this.peoplePhoneNotList;
+    }
+
+    /**
+    * 设置 手机号
+    * @param peoplePhoneNotList
+    */
+    public void setPeoplePhoneNotList(List<String> peoplePhoneNotList){
+        this.peoplePhoneNotList = peoplePhoneNotList;
+    }
+
+    /**
+    * 获取 工作人员姓名
+    * @return workmanNameList
+    */
+    public List<String> getWorkmanNameList(){
+        return this.workmanNameList;
+    }
+
+    /**
+    * 设置 工作人员姓名
+    * @param workmanNameList
+    */
+    public void setWorkmanNameList(List<String> workmanNameList){
+        this.workmanNameList = workmanNameList;
+    }
+
+    /**
+    * 获取 工作人员姓名
+    * @return workmanNameNotList
+    */
+    public List<String> getWorkmanNameNotList(){
+        return this.workmanNameNotList;
+    }
+
+    /**
+    * 设置 工作人员姓名
+    * @param workmanNameNotList
+    */
+    public void setWorkmanNameNotList(List<String> workmanNameNotList){
+        this.workmanNameNotList = workmanNameNotList;
+    }
+
+    /**
+    * 获取 工作人员工号
+    * @return workmanNumberList
+    */
+    public List<String> getWorkmanNumberList(){
+        return this.workmanNumberList;
+    }
+
+    /**
+    * 设置 工作人员工号
+    * @param workmanNumberList
+    */
+    public void setWorkmanNumberList(List<String> workmanNumberList){
+        this.workmanNumberList = workmanNumberList;
+    }
+
+    /**
+    * 获取 工作人员工号
+    * @return workmanNumberNotList
+    */
+    public List<String> getWorkmanNumberNotList(){
+        return this.workmanNumberNotList;
+    }
+
+    /**
+    * 设置 工作人员工号
+    * @param workmanNumberNotList
+    */
+    public void setWorkmanNumberNotList(List<String> workmanNumberNotList){
+        this.workmanNumberNotList = workmanNumberNotList;
+    }
+
+    /**
+    * 获取 开始 取号时间
+    * @return taketimeStart
+    */
+    public String getTaketimeStart(){
+        return this.taketimeStart;
+    }
+
+    /**
+    * 设置 开始 取号时间
+    * @param taketimeStart
+    */
+    public void setTaketimeStart(String taketimeStart){
+        this.taketimeStart = taketimeStart;
+    }
+
+    /**
+    * 获取 结束 取号时间
+    * @return taketimeEnd
+    */
+    public String getTaketimeEnd(){
+        return this.taketimeEnd;
+    }
+
+    /**
+    * 设置 结束 取号时间
+    * @param taketimeEnd
+    */
+    public void setTaketimeEnd(String taketimeEnd){
+        this.taketimeEnd = taketimeEnd;
+    }
+
+    /**
+    * 获取 开始 叫号时间
+    * @return calltimeStart
+    */
+    public String getCalltimeStart(){
+        return this.calltimeStart;
+    }
+
+    /**
+    * 设置 开始 叫号时间
+    * @param calltimeStart
+    */
+    public void setCalltimeStart(String calltimeStart){
+        this.calltimeStart = calltimeStart;
+    }
+
+    /**
+    * 获取 结束 叫号时间
+    * @return calltimeEnd
+    */
+    public String getCalltimeEnd(){
+        return this.calltimeEnd;
+    }
+
+    /**
+    * 设置 结束 叫号时间
+    * @param calltimeEnd
+    */
+    public void setCalltimeEnd(String calltimeEnd){
+        this.calltimeEnd = calltimeEnd;
+    }
+
+    /**
+    * 获取 开始 结束时间
+    * @return endtimeStart
+    */
+    public String getEndtimeStart(){
+        return this.endtimeStart;
+    }
+
+    /**
+    * 设置 开始 结束时间
+    * @param endtimeStart
+    */
+    public void setEndtimeStart(String endtimeStart){
+        this.endtimeStart = endtimeStart;
+    }
+
+    /**
+    * 获取 结束 结束时间
+    * @return endtimeEnd
+    */
+    public String getEndtimeEnd(){
+        return this.endtimeEnd;
+    }
+
+    /**
+    * 设置 结束 结束时间
+    * @param endtimeEnd
+    */
+    public void setEndtimeEnd(String endtimeEnd){
+        this.endtimeEnd = endtimeEnd;
+    }
+
+    /**
+    * 获取 开始 等待时间,单位s
+    * @return waitTimeStart
+    */
+    public Integer getWaitTimeStart(){
+        return this.waitTimeStart;
+    }
+
+    /**
+    * 设置 开始 等待时间,单位s
+    * @param waitTimeStart
+    */
+    public void setWaitTimeStart(Integer waitTimeStart){
+        this.waitTimeStart = waitTimeStart;
+    }
+
+    /**
+    * 获取 结束 等待时间,单位s
+    * @return $waitTimeEnd
+    */
+    public Integer getWaitTimeEnd(){
+        return this.waitTimeEnd;
+    }
+
+    /**
+    * 设置 结束 等待时间,单位s
+    * @param waitTimeEnd
+    */
+    public void setWaitTimeEnd(Integer waitTimeEnd){
+        this.waitTimeEnd = waitTimeEnd;
+    }
+
+    /**
+    * 获取 增加 等待时间,单位s
+    * @return waitTimeIncrement
+    */
+    public Integer getWaitTimeIncrement(){
+        return this.waitTimeIncrement;
+    }
+
+    /**
+    * 设置 增加 等待时间,单位s
+    * @param waitTimeIncrement
+    */
+    public void setWaitTimeIncrement(Integer waitTimeIncrement){
+        this.waitTimeIncrement = waitTimeIncrement;
+    }
+
+    /**
+    * 获取 等待时间,单位s
+    * @return waitTimeList
+    */
+    public List<Integer> getWaitTimeList(){
+        return this.waitTimeList;
+    }
+
+    /**
+    * 设置 等待时间,单位s
+    * @param waitTimeList
+    */
+    public void setWaitTimeList(List<Integer> waitTimeList){
+        this.waitTimeList = waitTimeList;
+    }
+
+    /**
+    * 获取 等待时间,单位s
+    * @return waitTimeNotList
+    */
+    public List<Integer> getWaitTimeNotList(){
+        return this.waitTimeNotList;
+    }
+
+    /**
+    * 设置 等待时间,单位s
+    * @param waitTimeNotList
+    */
+    public void setWaitTimeNotList(List<Integer> waitTimeNotList){
+        this.waitTimeNotList = waitTimeNotList;
+    }
+
+
+    /**
+    * 获取 开始 办理时间,单位s
+    * @return handleTimeStart
+    */
+    public Integer getHandleTimeStart(){
+        return this.handleTimeStart;
+    }
+
+    /**
+    * 设置 开始 办理时间,单位s
+    * @param handleTimeStart
+    */
+    public void setHandleTimeStart(Integer handleTimeStart){
+        this.handleTimeStart = handleTimeStart;
+    }
+
+    /**
+    * 获取 结束 办理时间,单位s
+    * @return $handleTimeEnd
+    */
+    public Integer getHandleTimeEnd(){
+        return this.handleTimeEnd;
+    }
+
+    /**
+    * 设置 结束 办理时间,单位s
+    * @param handleTimeEnd
+    */
+    public void setHandleTimeEnd(Integer handleTimeEnd){
+        this.handleTimeEnd = handleTimeEnd;
+    }
+
+    /**
+    * 获取 增加 办理时间,单位s
+    * @return handleTimeIncrement
+    */
+    public Integer getHandleTimeIncrement(){
+        return this.handleTimeIncrement;
+    }
+
+    /**
+    * 设置 增加 办理时间,单位s
+    * @param handleTimeIncrement
+    */
+    public void setHandleTimeIncrement(Integer handleTimeIncrement){
+        this.handleTimeIncrement = handleTimeIncrement;
+    }
+
+    /**
+    * 获取 办理时间,单位s
+    * @return handleTimeList
+    */
+    public List<Integer> getHandleTimeList(){
+        return this.handleTimeList;
+    }
+
+    /**
+    * 设置 办理时间,单位s
+    * @param handleTimeList
+    */
+    public void setHandleTimeList(List<Integer> handleTimeList){
+        this.handleTimeList = handleTimeList;
+    }
+
+    /**
+    * 获取 办理时间,单位s
+    * @return handleTimeNotList
+    */
+    public List<Integer> getHandleTimeNotList(){
+        return this.handleTimeNotList;
+    }
+
+    /**
+    * 设置 办理时间,单位s
+    * @param handleTimeNotList
+    */
+    public void setHandleTimeNotList(List<Integer> handleTimeNotList){
+        this.handleTimeNotList = handleTimeNotList;
+    }
+
+
+    /**
+    * 获取 取号设备名
+    * @return deviceNameList
+    */
+    public List<String> getDeviceNameList(){
+        return this.deviceNameList;
+    }
+
+    /**
+    * 设置 取号设备名
+    * @param deviceNameList
+    */
+    public void setDeviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+    }
+
+    /**
+    * 获取 取号设备名
+    * @return deviceNameNotList
+    */
+    public List<String> getDeviceNameNotList(){
+        return this.deviceNameNotList;
+    }
+
+    /**
+    * 设置 取号设备名
+    * @param deviceNameNotList
+    */
+    public void setDeviceNameNotList(List<String> deviceNameNotList){
+        this.deviceNameNotList = deviceNameNotList;
+    }
+
+    /**
+    * 获取 呼叫设备
+    * @return callNameList
+    */
+    public List<String> getCallNameList(){
+        return this.callNameList;
+    }
+
+    /**
+    * 设置 呼叫设备
+    * @param callNameList
+    */
+    public void setCallNameList(List<String> callNameList){
+        this.callNameList = callNameList;
+    }
+
+    /**
+    * 获取 呼叫设备
+    * @return callNameNotList
+    */
+    public List<String> getCallNameNotList(){
+        return this.callNameNotList;
+    }
+
+    /**
+    * 设置 呼叫设备
+    * @param callNameNotList
+    */
+    public void setCallNameNotList(List<String> callNameNotList){
+        this.callNameNotList = callNameNotList;
+    }
+
+    /**
+    * 获取 事项名
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+
+    /**
+    * 获取 事项名
+    * @return matterNameNotList
+    */
+    public List<String> getMatterNameNotList(){
+        return this.matterNameNotList;
+    }
+
+    /**
+    * 设置 事项名
+    * @param matterNameNotList
+    */
+    public void setMatterNameNotList(List<String> matterNameNotList){
+        this.matterNameNotList = matterNameNotList;
+    }
+
+    /**
+    * 获取 排号队列ID，唯一
+    * @return queueidList
+    */
+    public List<String> getQueueidList(){
+        return this.queueidList;
+    }
+
+    /**
+    * 设置 排号队列ID，唯一
+    * @param queueidList
+    */
+    public void setQueueidList(List<String> queueidList){
+        this.queueidList = queueidList;
+    }
+
+    /**
+    * 获取 排号队列ID，唯一
+    * @return queueidNotList
+    */
+    public List<String> getQueueidNotList(){
+        return this.queueidNotList;
+    }
+
+    /**
+    * 设置 排号队列ID，唯一
+    * @param queueidNotList
+    */
+    public void setQueueidNotList(List<String> queueidNotList){
+        this.queueidNotList = queueidNotList;
+    }
+
+    /**
+    * 获取 取号方式 (现场取号,微信取号)
+    * @return wySigninList
+    */
+    public List<String> getWySigninList(){
+        return this.wySigninList;
+    }
+
+    /**
+    * 设置 取号方式 (现场取号,微信取号)
+    * @param wySigninList
+    */
+    public void setWySigninList(List<String> wySigninList){
+        this.wySigninList = wySigninList;
+    }
+
+    /**
+    * 获取 取号方式 (现场取号,微信取号)
+    * @return wySigninNotList
+    */
+    public List<String> getWySigninNotList(){
+        return this.wySigninNotList;
+    }
+
+    /**
+    * 设置 取号方式 (现场取号,微信取号)
+    * @param wySigninNotList
+    */
+    public void setWySigninNotList(List<String> wySigninNotList){
+        this.wySigninNotList = wySigninNotList;
+    }
+
+    /**
+    * 获取 部门名称
+    * @return sectionNameList
+    */
+    public List<String> getSectionNameList(){
+        return this.sectionNameList;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param sectionNameList
+    */
+    public void setSectionNameList(List<String> sectionNameList){
+        this.sectionNameList = sectionNameList;
+    }
+
+    /**
+    * 获取 部门名称
+    * @return sectionNameNotList
+    */
+    public List<String> getSectionNameNotList(){
+        return this.sectionNameNotList;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param sectionNameNotList
+    */
+    public void setSectionNameNotList(List<String> sectionNameNotList){
+        this.sectionNameNotList = sectionNameNotList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameList
+    */
+    public List<String> getHallNameList(){
+        return this.hallNameList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public void setHallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameNotList
+    */
+    public List<String> getHallNameNotList(){
+        return this.hallNameNotList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameNotList
+    */
+    public void setHallNameNotList(List<String> hallNameNotList){
+        this.hallNameNotList = hallNameNotList;
+    }
+
+    /**
+    * 获取 取号设备类型
+    * @return deviceTypeList
+    */
+    public List<String> getDeviceTypeList(){
+        return this.deviceTypeList;
+    }
+
+    /**
+    * 设置 取号设备类型
+    * @param deviceTypeList
+    */
+    public void setDeviceTypeList(List<String> deviceTypeList){
+        this.deviceTypeList = deviceTypeList;
+    }
+
+    /**
+    * 获取 取号设备类型
+    * @return deviceTypeNotList
+    */
+    public List<String> getDeviceTypeNotList(){
+        return this.deviceTypeNotList;
+    }
+
+    /**
+    * 设置 取号设备类型
+    * @param deviceTypeNotList
+    */
+    public void setDeviceTypeNotList(List<String> deviceTypeNotList){
+        this.deviceTypeNotList = deviceTypeNotList;
+    }
+
+    /**
+    * 获取 开始 站点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 siteCodeList
+    */
+    public List<String> getSiteCodeList(){
+        return this.siteCodeList;
+    }
+
+    /**
+    * 设置 站点编码
+    * @param siteCodeList
+    */
+    public void setSiteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+    }
+
+    /**
+    * 获取 站点编码
+    * @return siteCodeNotList
+    */
+    public List<String> getSiteCodeNotList(){
+        return this.siteCodeNotList;
+    }
+
+    /**
+    * 设置 站点编码
+    * @param siteCodeNotList
+    */
+    public void setSiteCodeNotList(List<String> siteCodeNotList){
+        this.siteCodeNotList = siteCodeNotList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @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;
+    }
+
+    /**
+    * 获取 扩展编号
+    * @return extNumList
+    */
+    public List<String> getExtNumList(){
+        return this.extNumList;
+    }
+
+    /**
+    * 设置 扩展编号
+    * @param extNumList
+    */
+    public void setExtNumList(List<String> extNumList){
+        this.extNumList = extNumList;
+    }
+
+    /**
+    * 获取 扩展编号
+    * @return extNumNotList
+    */
+    public List<String> getExtNumNotList(){
+        return this.extNumNotList;
+    }
+
+    /**
+    * 设置 扩展编号
+    * @param extNumNotList
+    */
+    public void setExtNumNotList(List<String> extNumNotList){
+        this.extNumNotList = extNumNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @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;
+    }
+
+    /**
+    * 获取 开始 更新时间
+    * @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;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public PhQueueQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public PhQueueQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public PhQueueQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public PhQueueQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public PhQueueQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public PhQueueQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 预约编号，为空现场取号
+    * @param ordernumber
+    */
+    public PhQueueQuery ordernumber(String ordernumber){
+        setOrdernumber(ordernumber);
+		return this;
+    }
+
+    /**
+    * 设置 预约编号，为空现场取号
+    * @param ordernumberList
+    */
+    public PhQueueQuery ordernumberList(List<String> ordernumberList){
+        this.ordernumberList = ordernumberList;
+		return this;
+    }
+
+
+	/**
+    * 设置 叫号状态 (未叫号,叫号中,完成)
+    * @param style
+    */
+    public PhQueueQuery style(String style){
+        setStyle(style);
+		return this;
+    }
+
+    /**
+    * 设置 叫号状态 (未叫号,叫号中,完成)
+    * @param styleList
+    */
+    public PhQueueQuery styleList(List<String> styleList){
+        this.styleList = styleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 业务名
+    * @param business
+    */
+    public PhQueueQuery business(String business){
+        setBusiness(business);
+		return this;
+    }
+
+    /**
+    * 设置 业务名
+    * @param businessList
+    */
+    public PhQueueQuery businessList(List<String> businessList){
+        this.businessList = businessList;
+		return this;
+    }
+
+
+	/**
+    * 设置 窗口名
+    * @param windowName
+    */
+    public PhQueueQuery windowName(String windowName){
+        setWindowName(windowName);
+		return this;
+    }
+
+    /**
+    * 设置 窗口名
+    * @param windowNameList
+    */
+    public PhQueueQuery windowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 窗口编号
+    * @param windowFromnum
+    */
+    public PhQueueQuery windowFromnum(String windowFromnum){
+        setWindowFromnum(windowFromnum);
+		return this;
+    }
+
+    /**
+    * 设置 窗口编号
+    * @param windowFromnumList
+    */
+    public PhQueueQuery windowFromnumList(List<String> windowFromnumList){
+        this.windowFromnumList = windowFromnumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 流水编号,当天的第xxx号
+    * @param flownum
+    */
+    public PhQueueQuery flownum(String flownum){
+        setFlownum(flownum);
+		return this;
+    }
+
+    /**
+    * 设置 流水编号,当天的第xxx号
+    * @param flownumList
+    */
+    public PhQueueQuery flownumList(List<String> flownumList){
+        this.flownumList = flownumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 呼叫转移号
+    * @param formernum
+    */
+    public PhQueueQuery formernum(String formernum){
+        setFormernum(formernum);
+		return this;
+    }
+
+    /**
+    * 设置 呼叫转移号
+    * @param formernumList
+    */
+    public PhQueueQuery formernumList(List<String> formernumList){
+        this.formernumList = formernumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 身份证号
+    * @param peopleIdcard
+    */
+    public PhQueueQuery peopleIdcard(String peopleIdcard){
+        setPeopleIdcard(peopleIdcard);
+		return this;
+    }
+
+    /**
+    * 设置 身份证号
+    * @param peopleIdcardList
+    */
+    public PhQueueQuery peopleIdcardList(List<String> peopleIdcardList){
+        this.peopleIdcardList = peopleIdcardList;
+		return this;
+    }
+
+
+	/**
+    * 设置 姓名
+    * @param peopleName
+    */
+    public PhQueueQuery peopleName(String peopleName){
+        setPeopleName(peopleName);
+		return this;
+    }
+
+    /**
+    * 设置 姓名
+    * @param peopleNameList
+    */
+    public PhQueueQuery peopleNameList(List<String> peopleNameList){
+        this.peopleNameList = peopleNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 性别
+    * @param peopleSex
+    */
+    public PhQueueQuery peopleSex(String peopleSex){
+        setPeopleSex(peopleSex);
+		return this;
+    }
+
+    /**
+    * 设置 性别
+    * @param peopleSexList
+    */
+    public PhQueueQuery peopleSexList(List<String> peopleSexList){
+        this.peopleSexList = peopleSexList;
+		return this;
+    }
+
+
+	/**
+    * 设置 手机号
+    * @param peoplePhone
+    */
+    public PhQueueQuery peoplePhone(String peoplePhone){
+        setPeoplePhone(peoplePhone);
+		return this;
+    }
+
+    /**
+    * 设置 手机号
+    * @param peoplePhoneList
+    */
+    public PhQueueQuery peoplePhoneList(List<String> peoplePhoneList){
+        this.peoplePhoneList = peoplePhoneList;
+		return this;
+    }
+
+
+	/**
+    * 设置 工作人员姓名
+    * @param workmanName
+    */
+    public PhQueueQuery workmanName(String workmanName){
+        setWorkmanName(workmanName);
+		return this;
+    }
+
+    /**
+    * 设置 工作人员姓名
+    * @param workmanNameList
+    */
+    public PhQueueQuery workmanNameList(List<String> workmanNameList){
+        this.workmanNameList = workmanNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 工作人员工号
+    * @param workmanNumber
+    */
+    public PhQueueQuery workmanNumber(String workmanNumber){
+        setWorkmanNumber(workmanNumber);
+		return this;
+    }
+
+    /**
+    * 设置 工作人员工号
+    * @param workmanNumberList
+    */
+    public PhQueueQuery workmanNumberList(List<String> workmanNumberList){
+        this.workmanNumberList = workmanNumberList;
+		return this;
+    }
+
+
+
+
+    /**
+    * 设置  等待时间,单位s
+    * @param waitTime
+    */
+    public PhQueueQuery waitTime(Integer waitTime){
+	    setWaitTime(waitTime);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 等待时间,单位s
+    * @param waitTimeStart
+    */
+    public PhQueueQuery waitTimeStart(Integer waitTimeStart){
+		this.waitTimeStart = waitTimeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 等待时间,单位s
+    * @param waitTimeEnd
+    */
+    public PhQueueQuery waitTimeEnd(Integer waitTimeEnd){
+		this.waitTimeEnd = waitTimeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 等待时间,单位s
+    * @param waitTimeIncrement
+    */
+    public PhQueueQuery waitTimeIncrement(Integer waitTimeIncrement){
+		this.waitTimeIncrement = waitTimeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 等待时间,单位s
+    * @param waitTimeList
+    */
+    public PhQueueQuery waitTimeList(List<Integer> waitTimeList){
+        this.waitTimeList = waitTimeList;
+		return this;
+        }
+
+        /**
+        * 设置 等待时间,单位s
+        * @param waitTimeNotList
+        */
+        public PhQueueQuery waitTimeNotList(List<Integer> waitTimeNotList){
+        this.waitTimeNotList = waitTimeNotList;
+        return this;
+        }
+
+    /**
+    * 设置  办理时间,单位s
+    * @param handleTime
+    */
+    public PhQueueQuery handleTime(Integer handleTime){
+	    setHandleTime(handleTime);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 办理时间,单位s
+    * @param handleTimeStart
+    */
+    public PhQueueQuery handleTimeStart(Integer handleTimeStart){
+		this.handleTimeStart = handleTimeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 办理时间,单位s
+    * @param handleTimeEnd
+    */
+    public PhQueueQuery handleTimeEnd(Integer handleTimeEnd){
+		this.handleTimeEnd = handleTimeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 办理时间,单位s
+    * @param handleTimeIncrement
+    */
+    public PhQueueQuery handleTimeIncrement(Integer handleTimeIncrement){
+		this.handleTimeIncrement = handleTimeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 办理时间,单位s
+    * @param handleTimeList
+    */
+    public PhQueueQuery handleTimeList(List<Integer> handleTimeList){
+        this.handleTimeList = handleTimeList;
+		return this;
+        }
+
+        /**
+        * 设置 办理时间,单位s
+        * @param handleTimeNotList
+        */
+        public PhQueueQuery handleTimeNotList(List<Integer> handleTimeNotList){
+        this.handleTimeNotList = handleTimeNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 取号设备名
+    * @param deviceName
+    */
+    public PhQueueQuery deviceName(String deviceName){
+        setDeviceName(deviceName);
+		return this;
+    }
+
+    /**
+    * 设置 取号设备名
+    * @param deviceNameList
+    */
+    public PhQueueQuery deviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 呼叫设备
+    * @param callName
+    */
+    public PhQueueQuery callName(String callName){
+        setCallName(callName);
+		return this;
+    }
+
+    /**
+    * 设置 呼叫设备
+    * @param callNameList
+    */
+    public PhQueueQuery callNameList(List<String> callNameList){
+        this.callNameList = callNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名
+    * @param matterName
+    */
+    public PhQueueQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名
+    * @param matterNameList
+    */
+    public PhQueueQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 排号队列ID，唯一
+    * @param queueid
+    */
+    public PhQueueQuery queueid(String queueid){
+        setQueueid(queueid);
+		return this;
+    }
+
+    /**
+    * 设置 排号队列ID，唯一
+    * @param queueidList
+    */
+    public PhQueueQuery queueidList(List<String> queueidList){
+        this.queueidList = queueidList;
+		return this;
+    }
+
+
+	/**
+    * 设置 取号方式 (现场取号,微信取号)
+    * @param wySignin
+    */
+    public PhQueueQuery wySignin(String wySignin){
+        setWySignin(wySignin);
+		return this;
+    }
+
+    /**
+    * 设置 取号方式 (现场取号,微信取号)
+    * @param wySigninList
+    */
+    public PhQueueQuery wySigninList(List<String> wySigninList){
+        this.wySigninList = wySigninList;
+		return this;
+    }
+
+
+	/**
+    * 设置 部门名称
+    * @param sectionName
+    */
+    public PhQueueQuery sectionName(String sectionName){
+        setSectionName(sectionName);
+		return this;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param sectionNameList
+    */
+    public PhQueueQuery sectionNameList(List<String> sectionNameList){
+        this.sectionNameList = sectionNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 大厅名称
+    * @param hallName
+    */
+    public PhQueueQuery hallName(String hallName){
+        setHallName(hallName);
+		return this;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public PhQueueQuery hallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 取号设备类型
+    * @param deviceType
+    */
+    public PhQueueQuery deviceType(String deviceType){
+        setDeviceType(deviceType);
+		return this;
+    }
+
+    /**
+    * 设置 取号设备类型
+    * @param deviceTypeList
+    */
+    public PhQueueQuery deviceTypeList(List<String> deviceTypeList){
+        this.deviceTypeList = deviceTypeList;
+		return this;
+    }
+
+    /**
+    * 设置  站点Id
+    * @param siteId
+    */
+    public PhQueueQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点Id
+    * @param siteIdStart
+    */
+    public PhQueueQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点Id
+    * @param siteIdEnd
+    */
+    public PhQueueQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点Id
+    * @param siteIdIncrement
+    */
+    public PhQueueQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点Id
+    * @param siteIdList
+    */
+    public PhQueueQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点Id
+        * @param siteIdNotList
+        */
+        public PhQueueQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 站点编码
+    * @param siteCode
+    */
+    public PhQueueQuery siteCode(String siteCode){
+        setSiteCode(siteCode);
+		return this;
+    }
+
+    /**
+    * 设置 站点编码
+    * @param siteCodeList
+    */
+    public PhQueueQuery siteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public PhQueueQuery siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public PhQueueQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 扩展编号
+    * @param extNum
+    */
+    public PhQueueQuery extNum(String extNum){
+        setExtNum(extNum);
+		return this;
+    }
+
+    /**
+    * 设置 扩展编号
+    * @param extNumList
+    */
+    public PhQueueQuery extNumList(List<String> extNumList){
+        this.extNumList = extNumList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public PhQueueQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public PhQueueQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public PhQueueQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public PhQueueQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public PhQueueQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public PhQueueQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<PhQueueQuery> 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<PhQueueQuery> 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<PhQueueQuery> 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<PhQueueQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/ph/model/vo/PhQueueVo.java

+package com.mortals.xhx.module.ph.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 排号汇总视图对象
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Data
+public class PhQueueVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/ph/service/PhQueueService.java

+package com.mortals.xhx.module.ph.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+import com.mortals.xhx.module.ph.dao.PhQueueDao;
+/**
+* PhQueueService
+*
+* 排号汇总 service接口
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+public interface PhQueueService extends ICRUDService<PhQueueEntity,Long>{
+
+    PhQueueDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueServiceImpl.java

+package com.mortals.xhx.module.ph.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.ph.dao.PhQueueDao;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+import com.mortals.xhx.module.ph.service.PhQueueService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* PhQueueService
+* 排号汇总 service实现
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Service("phQueueService")
+@Slf4j
+public class PhQueueServiceImpl extends AbstractCRUDServiceImpl<PhQueueDao, PhQueueEntity, Long> implements PhQueueService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueController.java

+package com.mortals.xhx.module.ph.web;
+
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.service.SiteService;
+import org.apache.commons.lang3.ObjectUtils;
+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.ph.model.PhQueueEntity;
+import com.mortals.xhx.module.ph.service.PhQueueService;
+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.*;
+
+import com.mortals.xhx.common.code.*;
+
+/**
+ * 排号汇总
+ *
+ * @author zxfei
+ * @date 2024-04-09
+ */
+@RestController
+@RequestMapping("ph/queue")
+public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueueService, PhQueueEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+    @Autowired
+    private SiteService siteService;
+
+    public PhQueueController() {
+        super.setModuleDesc("排号汇总");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "style", StyleEnum.getEnumMap());
+        this.addDict(model, "wySignin", Wy_signinEnum.getEnumMap());
+        super.init(model, context);
+    }
+
+    /**
+     * @param entity
+     * @return
+     */
+    @Override
+    //@UnAuth
+    public String save(@RequestBody PhQueueEntity entity) {
+        //获取站点信息
+        getSite(entity);
+        return super.save(entity);
+    }
+
+    /**
+     * @param list
+     * @return
+     */
+    @Override
+    //@UnAuth
+    public String batchSave(@RequestBody List<PhQueueEntity> list) {
+        for (PhQueueEntity entity : list) {
+            getSite(entity);
+        }
+        return super.batchSave(list);
+    }
+
+
+    private void getSite(PhQueueEntity entity) {
+        if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+            SiteEntity siteCache = siteService.getCache(entity.getSiteId().toString());
+            if (!ObjectUtils.isEmpty(siteCache)) {
+                entity.setSiteCode(siteCache.getSiteCode());
+                entity.setSiteName(siteCache.getSiteName());
+            } else {
+                //通过站点编码查询
+                if (!ObjectUtils.isEmpty(entity.getSiteCode())) {
+                    siteCache = siteService.getExtCache(entity.getSiteCode());
+                    if (!ObjectUtils.isEmpty(siteCache)) {
+                        entity.setSiteCode(siteCache.getSiteCode());
+                        entity.setSiteName(siteCache.getSiteName());
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/pj/dao/PjEvaluateDao.java

+package com.mortals.xhx.module.pj.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
+import java.util.List;
+/**
+* 评价汇总Dao
+* 评价汇总 DAO接口
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+
+public interface  PjEvaluateDao extends ICRUDDao<PjEvaluateEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/pj/dao/ibatis/PjEvaluateDaoImpl.java

+package com.mortals.xhx.module.pj.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.pj.dao.PjEvaluateDao;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 评价汇总DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Repository("pjEvaluateDao")
+public class PjEvaluateDaoImpl extends BaseCRUDDaoMybatis<PjEvaluateEntity,Long> implements PjEvaluateDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/pj/model/PjEvaluateEntity.java

+package com.mortals.xhx.module.pj.model;
+import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.pj.model.vo.PjEvaluateVo;
+import lombok.Data;
+/**
+* 评价汇总实体对象
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Data
+public class PjEvaluateEntity extends PjEvaluateVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 评价人身份证号
+    */
+    private String peopleIdcard;
+    /**
+    * 评价人姓名
+    */
+    private String peopleName;
+    /**
+    * 评价人性别
+    */
+    private String peopleSex;
+    /**
+    * 评价人手机号
+    */
+    private String peoplePhone;
+    /**
+    * 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    */
+    private String pjOption;
+    /**
+    * 评价标签
+    */
+    private String contentTag;
+    /**
+    * 评价人图片地址
+    */
+    private String picUrl;
+    /**
+    * 部门
+    */
+    private String sectionName;
+    /**
+    * 大厅
+    */
+    private String hallName;
+    /**
+    * 评价来源 (安卓,导视机,微信)
+    */
+    private String pjSource;
+    /**
+    * 手输意见
+    */
+    private String opinion;
+    /**
+    * 窗口名
+    */
+    private String windowName;
+    /**
+    * 窗口编号
+    */
+    private String windowFromnum;
+    /**
+    * 排号编号
+    */
+    private String flounum;
+    /**
+    * 窗口评价(自助服务终端,背靠背评价,微官网)
+    */
+    private String pjxt;
+    /**
+    * 工作人员姓名
+    */
+    private String workmanName;
+    /**
+    * 工作人员工号
+    */
+    private String workmanNumber;
+    /**
+    * 评价器mac
+    */
+    private String devicenum;
+    /**
+    * 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    */
+    private String evaluatestatus;
+    /**
+    * 截图还是评价 (截图.截图,评价.评价)
+    */
+    private String evaluatetype;
+    /**
+    * 截图地址
+    */
+    private String photobefor;
+    /**
+    * 签字图片
+    */
+    private String photoautograph;
+    /**
+    * 抓拍评价人照片
+    */
+    private String picture;
+    /**
+    * 音频视频地址
+    */
+    private String process;
+    /**
+    * （未标记,标记非恶意差评,标记恶意差评
+    */
+    private String eyevaluate;
+    /**
+    * 评价指向 (窗口评价,部门评价,排号评价)
+    */
+    private String pjType;
+    /**
+    * 评价时间
+    */
+    private Date pjTime;
+    /**
+    * 站点Id
+    */
+    private Long siteId;
+    /**
+    * 站点编码
+    */
+    private String siteCode;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 扩展编号
+    */
+    private String extNum;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof PjEvaluateEntity) {
+            PjEvaluateEntity tmp = (PjEvaluateEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.peopleIdcard = "";
+            this.peopleName = "";
+            this.peopleSex = "";
+            this.peoplePhone = "";
+            this.pjOption = "";
+            this.contentTag = "";
+            this.picUrl = "";
+            this.sectionName = "";
+            this.hallName = "";
+            this.pjSource = "";
+            this.opinion = "";
+            this.windowName = "";
+            this.windowFromnum = "";
+            this.flounum = "";
+            this.pjxt = "窗口评价";
+            this.workmanName = "";
+            this.workmanNumber = "";
+            this.devicenum = "";
+            this.evaluatestatus = "等待评价";
+            this.evaluatetype = "截图";
+            this.photobefor = "";
+            this.photoautograph = "";
+            this.picture = "";
+            this.process = "";
+            this.eyevaluate = "未标记";
+            this.pjType = "窗口评价";
+            this.pjTime = new Date();
+            this.siteId = null;
+            this.siteCode = "";
+            this.siteName = "";
+            this.extNum = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/pj/model/PjEvaluateQuery.java

+package com.mortals.xhx.module.pj.model;
+
+import java.util.Date;
+import java.util.List;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
+/**
+* 评价汇总查询对象
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+public class PjEvaluateQuery extends PjEvaluateEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 评价人身份证号 */
+    private List<String> peopleIdcardList;
+
+    /** 评价人身份证号排除列表 */
+    private List <String> peopleIdcardNotList;
+    /** 评价人姓名 */
+    private List<String> peopleNameList;
+
+    /** 评价人姓名排除列表 */
+    private List <String> peopleNameNotList;
+    /** 评价人性别 */
+    private List<String> peopleSexList;
+
+    /** 评价人性别排除列表 */
+    private List <String> peopleSexNotList;
+    /** 评价人手机号 */
+    private List<String> peoplePhoneList;
+
+    /** 评价人手机号排除列表 */
+    private List <String> peoplePhoneNotList;
+    /** 评价选项(非常满意,满意,基本满意,不满意,非常不满意) */
+    private List<String> pjOptionList;
+
+    /** 评价选项(非常满意,满意,基本满意,不满意,非常不满意)排除列表 */
+    private List <String> pjOptionNotList;
+    /** 评价标签 */
+    private List<String> contentTagList;
+
+    /** 评价标签排除列表 */
+    private List <String> contentTagNotList;
+    /** 评价人图片地址 */
+    private List<String> picUrlList;
+
+    /** 评价人图片地址排除列表 */
+    private List <String> picUrlNotList;
+    /** 部门 */
+    private List<String> sectionNameList;
+
+    /** 部门排除列表 */
+    private List <String> sectionNameNotList;
+    /** 大厅 */
+    private List<String> hallNameList;
+
+    /** 大厅排除列表 */
+    private List <String> hallNameNotList;
+    /** 评价来源 (安卓,导视机,微信) */
+    private List<String> pjSourceList;
+
+    /** 评价来源 (安卓,导视机,微信)排除列表 */
+    private List <String> pjSourceNotList;
+    /** 手输意见 */
+    private List<String> opinionList;
+
+    /** 手输意见排除列表 */
+    private List <String> opinionNotList;
+    /** 窗口名 */
+    private List<String> windowNameList;
+
+    /** 窗口名排除列表 */
+    private List <String> windowNameNotList;
+    /** 窗口编号 */
+    private List<String> windowFromnumList;
+
+    /** 窗口编号排除列表 */
+    private List <String> windowFromnumNotList;
+    /** 排号编号 */
+    private List<String> flounumList;
+
+    /** 排号编号排除列表 */
+    private List <String> flounumNotList;
+    /** 窗口评价(自助服务终端,背靠背评价,微官网) */
+    private List<String> pjxtList;
+
+    /** 窗口评价(自助服务终端,背靠背评价,微官网)排除列表 */
+    private List <String> pjxtNotList;
+    /** 工作人员姓名 */
+    private List<String> workmanNameList;
+
+    /** 工作人员姓名排除列表 */
+    private List <String> workmanNameNotList;
+    /** 工作人员工号 */
+    private List<String> workmanNumberList;
+
+    /** 工作人员工号排除列表 */
+    private List <String> workmanNumberNotList;
+    /** 评价器mac */
+    private List<String> devicenumList;
+
+    /** 评价器mac排除列表 */
+    private List <String> devicenumNotList;
+    /** 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名 */
+    private List<String> evaluatestatusList;
+
+    /** 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名排除列表 */
+    private List <String> evaluatestatusNotList;
+    /** 截图还是评价 (截图.截图,评价.评价) */
+    private List<String> evaluatetypeList;
+
+    /** 截图还是评价 (截图.截图,评价.评价)排除列表 */
+    private List <String> evaluatetypeNotList;
+    /** 截图地址 */
+    private List<String> photobeforList;
+
+    /** 截图地址排除列表 */
+    private List <String> photobeforNotList;
+    /** 签字图片 */
+    private List<String> photoautographList;
+
+    /** 签字图片排除列表 */
+    private List <String> photoautographNotList;
+    /** 抓拍评价人照片 */
+    private List<String> pictureList;
+
+    /** 抓拍评价人照片排除列表 */
+    private List <String> pictureNotList;
+    /** 音频视频地址 */
+    private List<String> processList;
+
+    /** 音频视频地址排除列表 */
+    private List <String> processNotList;
+    /** （未标记,标记非恶意差评,标记恶意差评 */
+    private List<String> eyevaluateList;
+
+    /** （未标记,标记非恶意差评,标记恶意差评排除列表 */
+    private List <String> eyevaluateNotList;
+    /** 评价指向 (窗口评价,部门评价,排号评价) */
+    private List<String> pjTypeList;
+
+    /** 评价指向 (窗口评价,部门评价,排号评价)排除列表 */
+    private List <String> pjTypeNotList;
+    /** 开始 评价时间 */
+    private String pjTimeStart;
+
+    /** 结束 评价时间 */
+    private String pjTimeEnd;
+
+    /** 开始 站点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> siteCodeList;
+
+    /** 站点编码排除列表 */
+    private List <String> siteCodeNotList;
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 扩展编号 */
+    private List<String> extNumList;
+
+    /** 扩展编号排除列表 */
+    private List <String> extNumNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新时间 */
+    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<PjEvaluateQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<PjEvaluateQuery> andConditionList;
+
+    public PjEvaluateQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 评价人身份证号
+    * @return peopleIdcardList
+    */
+    public List<String> getPeopleIdcardList(){
+        return this.peopleIdcardList;
+    }
+
+    /**
+    * 设置 评价人身份证号
+    * @param peopleIdcardList
+    */
+    public void setPeopleIdcardList(List<String> peopleIdcardList){
+        this.peopleIdcardList = peopleIdcardList;
+    }
+
+    /**
+    * 获取 评价人身份证号
+    * @return peopleIdcardNotList
+    */
+    public List<String> getPeopleIdcardNotList(){
+        return this.peopleIdcardNotList;
+    }
+
+    /**
+    * 设置 评价人身份证号
+    * @param peopleIdcardNotList
+    */
+    public void setPeopleIdcardNotList(List<String> peopleIdcardNotList){
+        this.peopleIdcardNotList = peopleIdcardNotList;
+    }
+
+    /**
+    * 获取 评价人姓名
+    * @return peopleNameList
+    */
+    public List<String> getPeopleNameList(){
+        return this.peopleNameList;
+    }
+
+    /**
+    * 设置 评价人姓名
+    * @param peopleNameList
+    */
+    public void setPeopleNameList(List<String> peopleNameList){
+        this.peopleNameList = peopleNameList;
+    }
+
+    /**
+    * 获取 评价人姓名
+    * @return peopleNameNotList
+    */
+    public List<String> getPeopleNameNotList(){
+        return this.peopleNameNotList;
+    }
+
+    /**
+    * 设置 评价人姓名
+    * @param peopleNameNotList
+    */
+    public void setPeopleNameNotList(List<String> peopleNameNotList){
+        this.peopleNameNotList = peopleNameNotList;
+    }
+
+    /**
+    * 获取 评价人性别
+    * @return peopleSexList
+    */
+    public List<String> getPeopleSexList(){
+        return this.peopleSexList;
+    }
+
+    /**
+    * 设置 评价人性别
+    * @param peopleSexList
+    */
+    public void setPeopleSexList(List<String> peopleSexList){
+        this.peopleSexList = peopleSexList;
+    }
+
+    /**
+    * 获取 评价人性别
+    * @return peopleSexNotList
+    */
+    public List<String> getPeopleSexNotList(){
+        return this.peopleSexNotList;
+    }
+
+    /**
+    * 设置 评价人性别
+    * @param peopleSexNotList
+    */
+    public void setPeopleSexNotList(List<String> peopleSexNotList){
+        this.peopleSexNotList = peopleSexNotList;
+    }
+
+    /**
+    * 获取 评价人手机号
+    * @return peoplePhoneList
+    */
+    public List<String> getPeoplePhoneList(){
+        return this.peoplePhoneList;
+    }
+
+    /**
+    * 设置 评价人手机号
+    * @param peoplePhoneList
+    */
+    public void setPeoplePhoneList(List<String> peoplePhoneList){
+        this.peoplePhoneList = peoplePhoneList;
+    }
+
+    /**
+    * 获取 评价人手机号
+    * @return peoplePhoneNotList
+    */
+    public List<String> getPeoplePhoneNotList(){
+        return this.peoplePhoneNotList;
+    }
+
+    /**
+    * 设置 评价人手机号
+    * @param peoplePhoneNotList
+    */
+    public void setPeoplePhoneNotList(List<String> peoplePhoneNotList){
+        this.peoplePhoneNotList = peoplePhoneNotList;
+    }
+
+    /**
+    * 获取 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    * @return pjOptionList
+    */
+    public List<String> getPjOptionList(){
+        return this.pjOptionList;
+    }
+
+    /**
+    * 设置 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    * @param pjOptionList
+    */
+    public void setPjOptionList(List<String> pjOptionList){
+        this.pjOptionList = pjOptionList;
+    }
+
+    /**
+    * 获取 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    * @return pjOptionNotList
+    */
+    public List<String> getPjOptionNotList(){
+        return this.pjOptionNotList;
+    }
+
+    /**
+    * 设置 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    * @param pjOptionNotList
+    */
+    public void setPjOptionNotList(List<String> pjOptionNotList){
+        this.pjOptionNotList = pjOptionNotList;
+    }
+
+    /**
+    * 获取 评价标签
+    * @return contentTagList
+    */
+    public List<String> getContentTagList(){
+        return this.contentTagList;
+    }
+
+    /**
+    * 设置 评价标签
+    * @param contentTagList
+    */
+    public void setContentTagList(List<String> contentTagList){
+        this.contentTagList = contentTagList;
+    }
+
+    /**
+    * 获取 评价标签
+    * @return contentTagNotList
+    */
+    public List<String> getContentTagNotList(){
+        return this.contentTagNotList;
+    }
+
+    /**
+    * 设置 评价标签
+    * @param contentTagNotList
+    */
+    public void setContentTagNotList(List<String> contentTagNotList){
+        this.contentTagNotList = contentTagNotList;
+    }
+
+    /**
+    * 获取 评价人图片地址
+    * @return picUrlList
+    */
+    public List<String> getPicUrlList(){
+        return this.picUrlList;
+    }
+
+    /**
+    * 设置 评价人图片地址
+    * @param picUrlList
+    */
+    public void setPicUrlList(List<String> picUrlList){
+        this.picUrlList = picUrlList;
+    }
+
+    /**
+    * 获取 评价人图片地址
+    * @return picUrlNotList
+    */
+    public List<String> getPicUrlNotList(){
+        return this.picUrlNotList;
+    }
+
+    /**
+    * 设置 评价人图片地址
+    * @param picUrlNotList
+    */
+    public void setPicUrlNotList(List<String> picUrlNotList){
+        this.picUrlNotList = picUrlNotList;
+    }
+
+    /**
+    * 获取 部门
+    * @return sectionNameList
+    */
+    public List<String> getSectionNameList(){
+        return this.sectionNameList;
+    }
+
+    /**
+    * 设置 部门
+    * @param sectionNameList
+    */
+    public void setSectionNameList(List<String> sectionNameList){
+        this.sectionNameList = sectionNameList;
+    }
+
+    /**
+    * 获取 部门
+    * @return sectionNameNotList
+    */
+    public List<String> getSectionNameNotList(){
+        return this.sectionNameNotList;
+    }
+
+    /**
+    * 设置 部门
+    * @param sectionNameNotList
+    */
+    public void setSectionNameNotList(List<String> sectionNameNotList){
+        this.sectionNameNotList = sectionNameNotList;
+    }
+
+    /**
+    * 获取 大厅
+    * @return hallNameList
+    */
+    public List<String> getHallNameList(){
+        return this.hallNameList;
+    }
+
+    /**
+    * 设置 大厅
+    * @param hallNameList
+    */
+    public void setHallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+    }
+
+    /**
+    * 获取 大厅
+    * @return hallNameNotList
+    */
+    public List<String> getHallNameNotList(){
+        return this.hallNameNotList;
+    }
+
+    /**
+    * 设置 大厅
+    * @param hallNameNotList
+    */
+    public void setHallNameNotList(List<String> hallNameNotList){
+        this.hallNameNotList = hallNameNotList;
+    }
+
+    /**
+    * 获取 评价来源 (安卓,导视机,微信)
+    * @return pjSourceList
+    */
+    public List<String> getPjSourceList(){
+        return this.pjSourceList;
+    }
+
+    /**
+    * 设置 评价来源 (安卓,导视机,微信)
+    * @param pjSourceList
+    */
+    public void setPjSourceList(List<String> pjSourceList){
+        this.pjSourceList = pjSourceList;
+    }
+
+    /**
+    * 获取 评价来源 (安卓,导视机,微信)
+    * @return pjSourceNotList
+    */
+    public List<String> getPjSourceNotList(){
+        return this.pjSourceNotList;
+    }
+
+    /**
+    * 设置 评价来源 (安卓,导视机,微信)
+    * @param pjSourceNotList
+    */
+    public void setPjSourceNotList(List<String> pjSourceNotList){
+        this.pjSourceNotList = pjSourceNotList;
+    }
+
+    /**
+    * 获取 手输意见
+    * @return opinionList
+    */
+    public List<String> getOpinionList(){
+        return this.opinionList;
+    }
+
+    /**
+    * 设置 手输意见
+    * @param opinionList
+    */
+    public void setOpinionList(List<String> opinionList){
+        this.opinionList = opinionList;
+    }
+
+    /**
+    * 获取 手输意见
+    * @return opinionNotList
+    */
+    public List<String> getOpinionNotList(){
+        return this.opinionNotList;
+    }
+
+    /**
+    * 设置 手输意见
+    * @param opinionNotList
+    */
+    public void setOpinionNotList(List<String> opinionNotList){
+        this.opinionNotList = opinionNotList;
+    }
+
+    /**
+    * 获取 窗口名
+    * @return windowNameList
+    */
+    public List<String> getWindowNameList(){
+        return this.windowNameList;
+    }
+
+    /**
+    * 设置 窗口名
+    * @param windowNameList
+    */
+    public void setWindowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+    }
+
+    /**
+    * 获取 窗口名
+    * @return windowNameNotList
+    */
+    public List<String> getWindowNameNotList(){
+        return this.windowNameNotList;
+    }
+
+    /**
+    * 设置 窗口名
+    * @param windowNameNotList
+    */
+    public void setWindowNameNotList(List<String> windowNameNotList){
+        this.windowNameNotList = windowNameNotList;
+    }
+
+    /**
+    * 获取 窗口编号
+    * @return windowFromnumList
+    */
+    public List<String> getWindowFromnumList(){
+        return this.windowFromnumList;
+    }
+
+    /**
+    * 设置 窗口编号
+    * @param windowFromnumList
+    */
+    public void setWindowFromnumList(List<String> windowFromnumList){
+        this.windowFromnumList = windowFromnumList;
+    }
+
+    /**
+    * 获取 窗口编号
+    * @return windowFromnumNotList
+    */
+    public List<String> getWindowFromnumNotList(){
+        return this.windowFromnumNotList;
+    }
+
+    /**
+    * 设置 窗口编号
+    * @param windowFromnumNotList
+    */
+    public void setWindowFromnumNotList(List<String> windowFromnumNotList){
+        this.windowFromnumNotList = windowFromnumNotList;
+    }
+
+    /**
+    * 获取 排号编号
+    * @return flounumList
+    */
+    public List<String> getFlounumList(){
+        return this.flounumList;
+    }
+
+    /**
+    * 设置 排号编号
+    * @param flounumList
+    */
+    public void setFlounumList(List<String> flounumList){
+        this.flounumList = flounumList;
+    }
+
+    /**
+    * 获取 排号编号
+    * @return flounumNotList
+    */
+    public List<String> getFlounumNotList(){
+        return this.flounumNotList;
+    }
+
+    /**
+    * 设置 排号编号
+    * @param flounumNotList
+    */
+    public void setFlounumNotList(List<String> flounumNotList){
+        this.flounumNotList = flounumNotList;
+    }
+
+    /**
+    * 获取 窗口评价(自助服务终端,背靠背评价,微官网)
+    * @return pjxtList
+    */
+    public List<String> getPjxtList(){
+        return this.pjxtList;
+    }
+
+    /**
+    * 设置 窗口评价(自助服务终端,背靠背评价,微官网)
+    * @param pjxtList
+    */
+    public void setPjxtList(List<String> pjxtList){
+        this.pjxtList = pjxtList;
+    }
+
+    /**
+    * 获取 窗口评价(自助服务终端,背靠背评价,微官网)
+    * @return pjxtNotList
+    */
+    public List<String> getPjxtNotList(){
+        return this.pjxtNotList;
+    }
+
+    /**
+    * 设置 窗口评价(自助服务终端,背靠背评价,微官网)
+    * @param pjxtNotList
+    */
+    public void setPjxtNotList(List<String> pjxtNotList){
+        this.pjxtNotList = pjxtNotList;
+    }
+
+    /**
+    * 获取 工作人员姓名
+    * @return workmanNameList
+    */
+    public List<String> getWorkmanNameList(){
+        return this.workmanNameList;
+    }
+
+    /**
+    * 设置 工作人员姓名
+    * @param workmanNameList
+    */
+    public void setWorkmanNameList(List<String> workmanNameList){
+        this.workmanNameList = workmanNameList;
+    }
+
+    /**
+    * 获取 工作人员姓名
+    * @return workmanNameNotList
+    */
+    public List<String> getWorkmanNameNotList(){
+        return this.workmanNameNotList;
+    }
+
+    /**
+    * 设置 工作人员姓名
+    * @param workmanNameNotList
+    */
+    public void setWorkmanNameNotList(List<String> workmanNameNotList){
+        this.workmanNameNotList = workmanNameNotList;
+    }
+
+    /**
+    * 获取 工作人员工号
+    * @return workmanNumberList
+    */
+    public List<String> getWorkmanNumberList(){
+        return this.workmanNumberList;
+    }
+
+    /**
+    * 设置 工作人员工号
+    * @param workmanNumberList
+    */
+    public void setWorkmanNumberList(List<String> workmanNumberList){
+        this.workmanNumberList = workmanNumberList;
+    }
+
+    /**
+    * 获取 工作人员工号
+    * @return workmanNumberNotList
+    */
+    public List<String> getWorkmanNumberNotList(){
+        return this.workmanNumberNotList;
+    }
+
+    /**
+    * 设置 工作人员工号
+    * @param workmanNumberNotList
+    */
+    public void setWorkmanNumberNotList(List<String> workmanNumberNotList){
+        this.workmanNumberNotList = workmanNumberNotList;
+    }
+
+    /**
+    * 获取 评价器mac
+    * @return devicenumList
+    */
+    public List<String> getDevicenumList(){
+        return this.devicenumList;
+    }
+
+    /**
+    * 设置 评价器mac
+    * @param devicenumList
+    */
+    public void setDevicenumList(List<String> devicenumList){
+        this.devicenumList = devicenumList;
+    }
+
+    /**
+    * 获取 评价器mac
+    * @return devicenumNotList
+    */
+    public List<String> getDevicenumNotList(){
+        return this.devicenumNotList;
+    }
+
+    /**
+    * 设置 评价器mac
+    * @param devicenumNotList
+    */
+    public void setDevicenumNotList(List<String> devicenumNotList){
+        this.devicenumNotList = devicenumNotList;
+    }
+
+    /**
+    * 获取 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    * @return evaluatestatusList
+    */
+    public List<String> getEvaluatestatusList(){
+        return this.evaluatestatusList;
+    }
+
+    /**
+    * 设置 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    * @param evaluatestatusList
+    */
+    public void setEvaluatestatusList(List<String> evaluatestatusList){
+        this.evaluatestatusList = evaluatestatusList;
+    }
+
+    /**
+    * 获取 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    * @return evaluatestatusNotList
+    */
+    public List<String> getEvaluatestatusNotList(){
+        return this.evaluatestatusNotList;
+    }
+
+    /**
+    * 设置 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    * @param evaluatestatusNotList
+    */
+    public void setEvaluatestatusNotList(List<String> evaluatestatusNotList){
+        this.evaluatestatusNotList = evaluatestatusNotList;
+    }
+
+    /**
+    * 获取 截图还是评价 (截图.截图,评价.评价)
+    * @return evaluatetypeList
+    */
+    public List<String> getEvaluatetypeList(){
+        return this.evaluatetypeList;
+    }
+
+    /**
+    * 设置 截图还是评价 (截图.截图,评价.评价)
+    * @param evaluatetypeList
+    */
+    public void setEvaluatetypeList(List<String> evaluatetypeList){
+        this.evaluatetypeList = evaluatetypeList;
+    }
+
+    /**
+    * 获取 截图还是评价 (截图.截图,评价.评价)
+    * @return evaluatetypeNotList
+    */
+    public List<String> getEvaluatetypeNotList(){
+        return this.evaluatetypeNotList;
+    }
+
+    /**
+    * 设置 截图还是评价 (截图.截图,评价.评价)
+    * @param evaluatetypeNotList
+    */
+    public void setEvaluatetypeNotList(List<String> evaluatetypeNotList){
+        this.evaluatetypeNotList = evaluatetypeNotList;
+    }
+
+    /**
+    * 获取 截图地址
+    * @return photobeforList
+    */
+    public List<String> getPhotobeforList(){
+        return this.photobeforList;
+    }
+
+    /**
+    * 设置 截图地址
+    * @param photobeforList
+    */
+    public void setPhotobeforList(List<String> photobeforList){
+        this.photobeforList = photobeforList;
+    }
+
+    /**
+    * 获取 截图地址
+    * @return photobeforNotList
+    */
+    public List<String> getPhotobeforNotList(){
+        return this.photobeforNotList;
+    }
+
+    /**
+    * 设置 截图地址
+    * @param photobeforNotList
+    */
+    public void setPhotobeforNotList(List<String> photobeforNotList){
+        this.photobeforNotList = photobeforNotList;
+    }
+
+    /**
+    * 获取 签字图片
+    * @return photoautographList
+    */
+    public List<String> getPhotoautographList(){
+        return this.photoautographList;
+    }
+
+    /**
+    * 设置 签字图片
+    * @param photoautographList
+    */
+    public void setPhotoautographList(List<String> photoautographList){
+        this.photoautographList = photoautographList;
+    }
+
+    /**
+    * 获取 签字图片
+    * @return photoautographNotList
+    */
+    public List<String> getPhotoautographNotList(){
+        return this.photoautographNotList;
+    }
+
+    /**
+    * 设置 签字图片
+    * @param photoautographNotList
+    */
+    public void setPhotoautographNotList(List<String> photoautographNotList){
+        this.photoautographNotList = photoautographNotList;
+    }
+
+    /**
+    * 获取 抓拍评价人照片
+    * @return pictureList
+    */
+    public List<String> getPictureList(){
+        return this.pictureList;
+    }
+
+    /**
+    * 设置 抓拍评价人照片
+    * @param pictureList
+    */
+    public void setPictureList(List<String> pictureList){
+        this.pictureList = pictureList;
+    }
+
+    /**
+    * 获取 抓拍评价人照片
+    * @return pictureNotList
+    */
+    public List<String> getPictureNotList(){
+        return this.pictureNotList;
+    }
+
+    /**
+    * 设置 抓拍评价人照片
+    * @param pictureNotList
+    */
+    public void setPictureNotList(List<String> pictureNotList){
+        this.pictureNotList = pictureNotList;
+    }
+
+    /**
+    * 获取 音频视频地址
+    * @return processList
+    */
+    public List<String> getProcessList(){
+        return this.processList;
+    }
+
+    /**
+    * 设置 音频视频地址
+    * @param processList
+    */
+    public void setProcessList(List<String> processList){
+        this.processList = processList;
+    }
+
+    /**
+    * 获取 音频视频地址
+    * @return processNotList
+    */
+    public List<String> getProcessNotList(){
+        return this.processNotList;
+    }
+
+    /**
+    * 设置 音频视频地址
+    * @param processNotList
+    */
+    public void setProcessNotList(List<String> processNotList){
+        this.processNotList = processNotList;
+    }
+
+    /**
+    * 获取 （未标记,标记非恶意差评,标记恶意差评
+    * @return eyevaluateList
+    */
+    public List<String> getEyevaluateList(){
+        return this.eyevaluateList;
+    }
+
+    /**
+    * 设置 （未标记,标记非恶意差评,标记恶意差评
+    * @param eyevaluateList
+    */
+    public void setEyevaluateList(List<String> eyevaluateList){
+        this.eyevaluateList = eyevaluateList;
+    }
+
+    /**
+    * 获取 （未标记,标记非恶意差评,标记恶意差评
+    * @return eyevaluateNotList
+    */
+    public List<String> getEyevaluateNotList(){
+        return this.eyevaluateNotList;
+    }
+
+    /**
+    * 设置 （未标记,标记非恶意差评,标记恶意差评
+    * @param eyevaluateNotList
+    */
+    public void setEyevaluateNotList(List<String> eyevaluateNotList){
+        this.eyevaluateNotList = eyevaluateNotList;
+    }
+
+    /**
+    * 获取 评价指向 (窗口评价,部门评价,排号评价)
+    * @return pjTypeList
+    */
+    public List<String> getPjTypeList(){
+        return this.pjTypeList;
+    }
+
+    /**
+    * 设置 评价指向 (窗口评价,部门评价,排号评价)
+    * @param pjTypeList
+    */
+    public void setPjTypeList(List<String> pjTypeList){
+        this.pjTypeList = pjTypeList;
+    }
+
+    /**
+    * 获取 评价指向 (窗口评价,部门评价,排号评价)
+    * @return pjTypeNotList
+    */
+    public List<String> getPjTypeNotList(){
+        return this.pjTypeNotList;
+    }
+
+    /**
+    * 设置 评价指向 (窗口评价,部门评价,排号评价)
+    * @param pjTypeNotList
+    */
+    public void setPjTypeNotList(List<String> pjTypeNotList){
+        this.pjTypeNotList = pjTypeNotList;
+    }
+
+    /**
+    * 获取 开始 评价时间
+    * @return pjTimeStart
+    */
+    public String getPjTimeStart(){
+        return this.pjTimeStart;
+    }
+
+    /**
+    * 设置 开始 评价时间
+    * @param pjTimeStart
+    */
+    public void setPjTimeStart(String pjTimeStart){
+        this.pjTimeStart = pjTimeStart;
+    }
+
+    /**
+    * 获取 结束 评价时间
+    * @return pjTimeEnd
+    */
+    public String getPjTimeEnd(){
+        return this.pjTimeEnd;
+    }
+
+    /**
+    * 设置 结束 评价时间
+    * @param pjTimeEnd
+    */
+    public void setPjTimeEnd(String pjTimeEnd){
+        this.pjTimeEnd = pjTimeEnd;
+    }
+
+    /**
+    * 获取 开始 站点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 siteCodeList
+    */
+    public List<String> getSiteCodeList(){
+        return this.siteCodeList;
+    }
+
+    /**
+    * 设置 站点编码
+    * @param siteCodeList
+    */
+    public void setSiteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+    }
+
+    /**
+    * 获取 站点编码
+    * @return siteCodeNotList
+    */
+    public List<String> getSiteCodeNotList(){
+        return this.siteCodeNotList;
+    }
+
+    /**
+    * 设置 站点编码
+    * @param siteCodeNotList
+    */
+    public void setSiteCodeNotList(List<String> siteCodeNotList){
+        this.siteCodeNotList = siteCodeNotList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @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;
+    }
+
+    /**
+    * 获取 扩展编号
+    * @return extNumList
+    */
+    public List<String> getExtNumList(){
+        return this.extNumList;
+    }
+
+    /**
+    * 设置 扩展编号
+    * @param extNumList
+    */
+    public void setExtNumList(List<String> extNumList){
+        this.extNumList = extNumList;
+    }
+
+    /**
+    * 获取 扩展编号
+    * @return extNumNotList
+    */
+    public List<String> getExtNumNotList(){
+        return this.extNumNotList;
+    }
+
+    /**
+    * 设置 扩展编号
+    * @param extNumNotList
+    */
+    public void setExtNumNotList(List<String> extNumNotList){
+        this.extNumNotList = extNumNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @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;
+    }
+
+    /**
+    * 获取 开始 更新时间
+    * @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;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public PjEvaluateQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public PjEvaluateQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public PjEvaluateQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public PjEvaluateQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public PjEvaluateQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public PjEvaluateQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 评价人身份证号
+    * @param peopleIdcard
+    */
+    public PjEvaluateQuery peopleIdcard(String peopleIdcard){
+        setPeopleIdcard(peopleIdcard);
+		return this;
+    }
+
+    /**
+    * 设置 评价人身份证号
+    * @param peopleIdcardList
+    */
+    public PjEvaluateQuery peopleIdcardList(List<String> peopleIdcardList){
+        this.peopleIdcardList = peopleIdcardList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价人姓名
+    * @param peopleName
+    */
+    public PjEvaluateQuery peopleName(String peopleName){
+        setPeopleName(peopleName);
+		return this;
+    }
+
+    /**
+    * 设置 评价人姓名
+    * @param peopleNameList
+    */
+    public PjEvaluateQuery peopleNameList(List<String> peopleNameList){
+        this.peopleNameList = peopleNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价人性别
+    * @param peopleSex
+    */
+    public PjEvaluateQuery peopleSex(String peopleSex){
+        setPeopleSex(peopleSex);
+		return this;
+    }
+
+    /**
+    * 设置 评价人性别
+    * @param peopleSexList
+    */
+    public PjEvaluateQuery peopleSexList(List<String> peopleSexList){
+        this.peopleSexList = peopleSexList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价人手机号
+    * @param peoplePhone
+    */
+    public PjEvaluateQuery peoplePhone(String peoplePhone){
+        setPeoplePhone(peoplePhone);
+		return this;
+    }
+
+    /**
+    * 设置 评价人手机号
+    * @param peoplePhoneList
+    */
+    public PjEvaluateQuery peoplePhoneList(List<String> peoplePhoneList){
+        this.peoplePhoneList = peoplePhoneList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    * @param pjOption
+    */
+    public PjEvaluateQuery pjOption(String pjOption){
+        setPjOption(pjOption);
+		return this;
+    }
+
+    /**
+    * 设置 评价选项(非常满意,满意,基本满意,不满意,非常不满意)
+    * @param pjOptionList
+    */
+    public PjEvaluateQuery pjOptionList(List<String> pjOptionList){
+        this.pjOptionList = pjOptionList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价标签
+    * @param contentTag
+    */
+    public PjEvaluateQuery contentTag(String contentTag){
+        setContentTag(contentTag);
+		return this;
+    }
+
+    /**
+    * 设置 评价标签
+    * @param contentTagList
+    */
+    public PjEvaluateQuery contentTagList(List<String> contentTagList){
+        this.contentTagList = contentTagList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价人图片地址
+    * @param picUrl
+    */
+    public PjEvaluateQuery picUrl(String picUrl){
+        setPicUrl(picUrl);
+		return this;
+    }
+
+    /**
+    * 设置 评价人图片地址
+    * @param picUrlList
+    */
+    public PjEvaluateQuery picUrlList(List<String> picUrlList){
+        this.picUrlList = picUrlList;
+		return this;
+    }
+
+
+	/**
+    * 设置 部门
+    * @param sectionName
+    */
+    public PjEvaluateQuery sectionName(String sectionName){
+        setSectionName(sectionName);
+		return this;
+    }
+
+    /**
+    * 设置 部门
+    * @param sectionNameList
+    */
+    public PjEvaluateQuery sectionNameList(List<String> sectionNameList){
+        this.sectionNameList = sectionNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 大厅
+    * @param hallName
+    */
+    public PjEvaluateQuery hallName(String hallName){
+        setHallName(hallName);
+		return this;
+    }
+
+    /**
+    * 设置 大厅
+    * @param hallNameList
+    */
+    public PjEvaluateQuery hallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价来源 (安卓,导视机,微信)
+    * @param pjSource
+    */
+    public PjEvaluateQuery pjSource(String pjSource){
+        setPjSource(pjSource);
+		return this;
+    }
+
+    /**
+    * 设置 评价来源 (安卓,导视机,微信)
+    * @param pjSourceList
+    */
+    public PjEvaluateQuery pjSourceList(List<String> pjSourceList){
+        this.pjSourceList = pjSourceList;
+		return this;
+    }
+
+
+	/**
+    * 设置 手输意见
+    * @param opinion
+    */
+    public PjEvaluateQuery opinion(String opinion){
+        setOpinion(opinion);
+		return this;
+    }
+
+    /**
+    * 设置 手输意见
+    * @param opinionList
+    */
+    public PjEvaluateQuery opinionList(List<String> opinionList){
+        this.opinionList = opinionList;
+		return this;
+    }
+
+
+	/**
+    * 设置 窗口名
+    * @param windowName
+    */
+    public PjEvaluateQuery windowName(String windowName){
+        setWindowName(windowName);
+		return this;
+    }
+
+    /**
+    * 设置 窗口名
+    * @param windowNameList
+    */
+    public PjEvaluateQuery windowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 窗口编号
+    * @param windowFromnum
+    */
+    public PjEvaluateQuery windowFromnum(String windowFromnum){
+        setWindowFromnum(windowFromnum);
+		return this;
+    }
+
+    /**
+    * 设置 窗口编号
+    * @param windowFromnumList
+    */
+    public PjEvaluateQuery windowFromnumList(List<String> windowFromnumList){
+        this.windowFromnumList = windowFromnumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 排号编号
+    * @param flounum
+    */
+    public PjEvaluateQuery flounum(String flounum){
+        setFlounum(flounum);
+		return this;
+    }
+
+    /**
+    * 设置 排号编号
+    * @param flounumList
+    */
+    public PjEvaluateQuery flounumList(List<String> flounumList){
+        this.flounumList = flounumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 窗口评价(自助服务终端,背靠背评价,微官网)
+    * @param pjxt
+    */
+    public PjEvaluateQuery pjxt(String pjxt){
+        setPjxt(pjxt);
+		return this;
+    }
+
+    /**
+    * 设置 窗口评价(自助服务终端,背靠背评价,微官网)
+    * @param pjxtList
+    */
+    public PjEvaluateQuery pjxtList(List<String> pjxtList){
+        this.pjxtList = pjxtList;
+		return this;
+    }
+
+
+	/**
+    * 设置 工作人员姓名
+    * @param workmanName
+    */
+    public PjEvaluateQuery workmanName(String workmanName){
+        setWorkmanName(workmanName);
+		return this;
+    }
+
+    /**
+    * 设置 工作人员姓名
+    * @param workmanNameList
+    */
+    public PjEvaluateQuery workmanNameList(List<String> workmanNameList){
+        this.workmanNameList = workmanNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 工作人员工号
+    * @param workmanNumber
+    */
+    public PjEvaluateQuery workmanNumber(String workmanNumber){
+        setWorkmanNumber(workmanNumber);
+		return this;
+    }
+
+    /**
+    * 设置 工作人员工号
+    * @param workmanNumberList
+    */
+    public PjEvaluateQuery workmanNumberList(List<String> workmanNumberList){
+        this.workmanNumberList = workmanNumberList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价器mac
+    * @param devicenum
+    */
+    public PjEvaluateQuery devicenum(String devicenum){
+        setDevicenum(devicenum);
+		return this;
+    }
+
+    /**
+    * 设置 评价器mac
+    * @param devicenumList
+    */
+    public PjEvaluateQuery devicenumList(List<String> devicenumList){
+        this.devicenumList = devicenumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    * @param evaluatestatus
+    */
+    public PjEvaluateQuery evaluatestatus(String evaluatestatus){
+        setEvaluatestatus(evaluatestatus);
+		return this;
+    }
+
+    /**
+    * 设置 评价状态(等待评价,完成,截图有误,用户截图签名超时,用户评价超时,收到图片等待签名
+    * @param evaluatestatusList
+    */
+    public PjEvaluateQuery evaluatestatusList(List<String> evaluatestatusList){
+        this.evaluatestatusList = evaluatestatusList;
+		return this;
+    }
+
+
+	/**
+    * 设置 截图还是评价 (截图.截图,评价.评价)
+    * @param evaluatetype
+    */
+    public PjEvaluateQuery evaluatetype(String evaluatetype){
+        setEvaluatetype(evaluatetype);
+		return this;
+    }
+
+    /**
+    * 设置 截图还是评价 (截图.截图,评价.评价)
+    * @param evaluatetypeList
+    */
+    public PjEvaluateQuery evaluatetypeList(List<String> evaluatetypeList){
+        this.evaluatetypeList = evaluatetypeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 截图地址
+    * @param photobefor
+    */
+    public PjEvaluateQuery photobefor(String photobefor){
+        setPhotobefor(photobefor);
+		return this;
+    }
+
+    /**
+    * 设置 截图地址
+    * @param photobeforList
+    */
+    public PjEvaluateQuery photobeforList(List<String> photobeforList){
+        this.photobeforList = photobeforList;
+		return this;
+    }
+
+
+	/**
+    * 设置 签字图片
+    * @param photoautograph
+    */
+    public PjEvaluateQuery photoautograph(String photoautograph){
+        setPhotoautograph(photoautograph);
+		return this;
+    }
+
+    /**
+    * 设置 签字图片
+    * @param photoautographList
+    */
+    public PjEvaluateQuery photoautographList(List<String> photoautographList){
+        this.photoautographList = photoautographList;
+		return this;
+    }
+
+
+	/**
+    * 设置 抓拍评价人照片
+    * @param picture
+    */
+    public PjEvaluateQuery picture(String picture){
+        setPicture(picture);
+		return this;
+    }
+
+    /**
+    * 设置 抓拍评价人照片
+    * @param pictureList
+    */
+    public PjEvaluateQuery pictureList(List<String> pictureList){
+        this.pictureList = pictureList;
+		return this;
+    }
+
+
+	/**
+    * 设置 音频视频地址
+    * @param process
+    */
+    public PjEvaluateQuery process(String process){
+        setProcess(process);
+		return this;
+    }
+
+    /**
+    * 设置 音频视频地址
+    * @param processList
+    */
+    public PjEvaluateQuery processList(List<String> processList){
+        this.processList = processList;
+		return this;
+    }
+
+
+	/**
+    * 设置 （未标记,标记非恶意差评,标记恶意差评
+    * @param eyevaluate
+    */
+    public PjEvaluateQuery eyevaluate(String eyevaluate){
+        setEyevaluate(eyevaluate);
+		return this;
+    }
+
+    /**
+    * 设置 （未标记,标记非恶意差评,标记恶意差评
+    * @param eyevaluateList
+    */
+    public PjEvaluateQuery eyevaluateList(List<String> eyevaluateList){
+        this.eyevaluateList = eyevaluateList;
+		return this;
+    }
+
+
+	/**
+    * 设置 评价指向 (窗口评价,部门评价,排号评价)
+    * @param pjType
+    */
+    public PjEvaluateQuery pjType(String pjType){
+        setPjType(pjType);
+		return this;
+    }
+
+    /**
+    * 设置 评价指向 (窗口评价,部门评价,排号评价)
+    * @param pjTypeList
+    */
+    public PjEvaluateQuery pjTypeList(List<String> pjTypeList){
+        this.pjTypeList = pjTypeList;
+		return this;
+    }
+
+
+    /**
+    * 设置  站点Id
+    * @param siteId
+    */
+    public PjEvaluateQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点Id
+    * @param siteIdStart
+    */
+    public PjEvaluateQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点Id
+    * @param siteIdEnd
+    */
+    public PjEvaluateQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点Id
+    * @param siteIdIncrement
+    */
+    public PjEvaluateQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点Id
+    * @param siteIdList
+    */
+    public PjEvaluateQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点Id
+        * @param siteIdNotList
+        */
+        public PjEvaluateQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 站点编码
+    * @param siteCode
+    */
+    public PjEvaluateQuery siteCode(String siteCode){
+        setSiteCode(siteCode);
+		return this;
+    }
+
+    /**
+    * 设置 站点编码
+    * @param siteCodeList
+    */
+    public PjEvaluateQuery siteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public PjEvaluateQuery siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public PjEvaluateQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 扩展编号
+    * @param extNum
+    */
+    public PjEvaluateQuery extNum(String extNum){
+        setExtNum(extNum);
+		return this;
+    }
+
+    /**
+    * 设置 扩展编号
+    * @param extNumList
+    */
+    public PjEvaluateQuery extNumList(List<String> extNumList){
+        this.extNumList = extNumList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public PjEvaluateQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public PjEvaluateQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public PjEvaluateQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public PjEvaluateQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public PjEvaluateQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public PjEvaluateQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<PjEvaluateQuery> 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<PjEvaluateQuery> 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<PjEvaluateQuery> 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<PjEvaluateQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/pj/model/vo/PjEvaluateVo.java

+package com.mortals.xhx.module.pj.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 评价汇总视图对象
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Data
+public class PjEvaluateVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/pj/service/PjEvaluateService.java

+package com.mortals.xhx.module.pj.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
+import com.mortals.xhx.module.pj.dao.PjEvaluateDao;
+/**
+* PjEvaluateService
+*
+* 评价汇总 service接口
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+public interface PjEvaluateService extends ICRUDService<PjEvaluateEntity,Long>{
+
+    PjEvaluateDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/pj/service/impl/PjEvaluateServiceImpl.java

+package com.mortals.xhx.module.pj.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.pj.dao.PjEvaluateDao;
+import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
+import com.mortals.xhx.module.pj.service.PjEvaluateService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* PjEvaluateService
+* 评价汇总 service实现
+*
+* @author zxfei
+* @date 2024-04-09
+*/
+@Service("pjEvaluateService")
+@Slf4j
+public class PjEvaluateServiceImpl extends AbstractCRUDServiceImpl<PjEvaluateDao, PjEvaluateEntity, Long> implements PjEvaluateService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateController.java

+package com.mortals.xhx.module.pj.web;
+
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.ph.model.PhQueueEntity;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.service.SiteService;
+import org.apache.commons.lang3.ObjectUtils;
+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.pj.model.PjEvaluateEntity;
+import com.mortals.xhx.module.pj.service.PjEvaluateService;
+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.*;
+
+import com.mortals.xhx.common.code.*;
+
+/**
+ * 评价汇总
+ *
+ * @author zxfei
+ * @date 2024-04-09
+ */
+@RestController
+@RequestMapping("pj/evaluate")
+public class PjEvaluateController extends BaseCRUDJsonBodyMappingController<PjEvaluateService, PjEvaluateEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    @Autowired
+    private SiteService siteService;
+
+    public PjEvaluateController() {
+        super.setModuleDesc("评价汇总");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "pjOption", Pj_optionEnum.getEnumMap());
+        this.addDict(model, "pjSource", Pj_sourceEnum.getEnumMap());
+        this.addDict(model, "pjxt", PjxtEnum.getEnumMap());
+        this.addDict(model, "evaluatetype", EvaluatetypeEnum.getEnumMap());
+        this.addDict(model, "pjType", Pj_typeEnum.getEnumMap());
+        super.init(model, context);
+    }
+
+    /**
+     * @param entity
+     * @return
+     */
+    @Override
+    //@UnAuth
+    public String save(@RequestBody PjEvaluateEntity entity) {
+        //获取站点信息
+        getSite(entity);
+        return super.save(entity);
+    }
+
+    /**
+     * @param list
+     * @return
+     */
+    @Override
+    //@UnAuth
+    public String batchSave(@RequestBody List<PjEvaluateEntity> list) {
+        for (PjEvaluateEntity entity : list) {
+            getSite(entity);
+        }
+        return super.batchSave(list);
+    }
+
+
+    private void getSite(PjEvaluateEntity entity) {
+        if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+            SiteEntity siteCache = siteService.getCache(entity.getSiteId().toString());
+            if (!ObjectUtils.isEmpty(siteCache)) {
+                entity.setSiteCode(siteCache.getSiteCode());
+                entity.setSiteName(siteCache.getSiteName());
+            } else {
+                //通过站点编码查询
+                if (!ObjectUtils.isEmpty(entity.getSiteCode())) {
+                    siteCache = siteService.getExtCache(entity.getSiteCode());
+                    if (!ObjectUtils.isEmpty(siteCache)) {
+                        entity.setSiteCode(siteCache.getSiteCode());
+                        entity.setSiteName(siteCache.getSiteName());
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -115,6 +115,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     private volatile Boolean refresh = false;
 
+    @Override
+    protected String getExtKey(SiteEntity data) {
+        return data.getSiteCode();
+    }
 
     @Override
     protected void updateBefore(SiteEntity entity, Context context) throws AppException {

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -90,10 +90,6 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         log.info("doLogin==>{}", JSON.toJSONString(query));
         JSONObject ret = new JSONObject();
         try {
-            //检测用户密码是否为123
-/*            if ("123".equals(query.getLoginPwd())){
-                throw new AppException("当前密码123已过期！请使用新密码重新登录:a1b2c3d4");
-            }*/
             String ip = super.getRequestIP(request);
             WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
             workmanEntity.setLastLoginAddress(ip);

base-manager/src/main/resources/sqlmap/module/ph/PhQueueMapper.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.ph.dao.ibatis.PhQueueDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="PhQueueEntity" id="PhQueueEntity-Map">
+            <id  property="id" column="id" />
+            <result property="ordernumber" column="ordernumber" />
+            <result property="style" column="style" />
+            <result property="business" column="business" />
+            <result property="windowName" column="window_name" />
+            <result property="windowFromnum" column="window_fromnum" />
+            <result property="flownum" column="flownum" />
+            <result property="formernum" column="formernum" />
+            <result property="peopleIdcard" column="people_idcard" />
+            <result property="peopleName" column="people_name" />
+            <result property="peopleSex" column="people_sex" />
+            <result property="peoplePhone" column="people_phone" />
+            <result property="workmanName" column="workman_name" />
+            <result property="workmanNumber" column="workman_number" />
+            <result property="taketime" column="taketime" />
+            <result property="calltime" column="calltime" />
+            <result property="endtime" column="endtime" />
+            <result property="waitTime" column="wait_time" />
+            <result property="handleTime" column="handle_time" />
+            <result property="deviceName" column="device_name" />
+            <result property="callName" column="call_name" />
+            <result property="matterName" column="matter_name" />
+            <result property="queueid" column="queueid" />
+            <result property="wySignin" column="wy_signin" />
+            <result property="sectionName" column="section_name" />
+            <result property="hallName" column="hall_name" />
+            <result property="deviceType" column="device_type" />
+            <result property="siteId" column="site_id" />
+            <result property="siteCode" column="site_code" />
+            <result property="siteName" column="site_name" />
+            <result property="extNum" column="ext_num" />
+            <result property="createUserId" column="create_user_id" />
+            <result property="createTime" column="create_time" />
+            <result property="updateTime" column="update_time" />
+            
+    </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('ordernumber') or colPickMode == 1 and data.containsKey('ordernumber')))">
+                    a.ordernumber,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('style') or colPickMode == 1 and data.containsKey('style')))">
+                    a.style,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('business') or colPickMode == 1 and data.containsKey('business')))">
+                    a.business,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowName') or colPickMode == 1 and data.containsKey('windowName')))">
+                    a.window_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowFromnum') or colPickMode == 1 and data.containsKey('windowFromnum')))">
+                    a.window_fromnum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flownum') or colPickMode == 1 and data.containsKey('flownum')))">
+                    a.flownum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formernum') or colPickMode == 1 and data.containsKey('formernum')))">
+                    a.formernum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peopleIdcard') or colPickMode == 1 and data.containsKey('peopleIdcard')))">
+                    a.people_idcard,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peopleName') or colPickMode == 1 and data.containsKey('peopleName')))">
+                    a.people_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peopleSex') or colPickMode == 1 and data.containsKey('peopleSex')))">
+                    a.people_sex,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peoplePhone') or colPickMode == 1 and data.containsKey('peoplePhone')))">
+                    a.people_phone,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workmanName') or colPickMode == 1 and data.containsKey('workmanName')))">
+                    a.workman_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workmanNumber') or colPickMode == 1 and data.containsKey('workmanNumber')))">
+                    a.workman_number,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('taketime') or colPickMode == 1 and data.containsKey('taketime')))">
+                    a.taketime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('calltime') or colPickMode == 1 and data.containsKey('calltime')))">
+                    a.calltime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('endtime') or colPickMode == 1 and data.containsKey('endtime')))">
+                    a.endtime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('waitTime') or colPickMode == 1 and data.containsKey('waitTime')))">
+                    a.wait_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('handleTime') or colPickMode == 1 and data.containsKey('handleTime')))">
+                    a.handle_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
+                    a.device_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('callName') or colPickMode == 1 and data.containsKey('callName')))">
+                    a.call_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matter_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('queueid') or colPickMode == 1 and data.containsKey('queueid')))">
+                    a.queueid,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('wySignin') or colPickMode == 1 and data.containsKey('wySignin')))">
+                    a.wy_signin,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sectionName') or colPickMode == 1 and data.containsKey('sectionName')))">
+                    a.section_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                    a.hall_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))">
+                    a.device_type,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.site_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                    a.site_code,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                    a.site_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('extNum') or colPickMode == 1 and data.containsKey('extNum')))">
+                    a.ext_num,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.create_user_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.create_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.update_time,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="PhQueueEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_ph_queue
+        (ordernumber,style,business,window_name,window_fromnum,flownum,formernum,people_idcard,people_name,people_sex,people_phone,workman_name,workman_number,taketime,calltime,endtime,wait_time,handle_time,device_name,call_name,matter_name,queueid,wy_signin,section_name,hall_name,device_type,site_id,site_code,site_name,ext_num,create_user_id,create_time,update_time)
+        VALUES
+        (#{ordernumber},#{style},#{business},#{windowName},#{windowFromnum},#{flownum},#{formernum},#{peopleIdcard},#{peopleName},#{peopleSex},#{peoplePhone},#{workmanName},#{workmanNumber},#{taketime},#{calltime},#{endtime},#{waitTime},#{handleTime},#{deviceName},#{callName},#{matterName},#{queueid},#{wySignin},#{sectionName},#{hallName},#{deviceType},#{siteId},#{siteCode},#{siteName},#{extNum},#{createUserId},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_ph_queue
+        (ordernumber,style,business,window_name,window_fromnum,flownum,formernum,people_idcard,people_name,people_sex,people_phone,workman_name,workman_number,taketime,calltime,endtime,wait_time,handle_time,device_name,call_name,matter_name,queueid,wy_signin,section_name,hall_name,device_type,site_id,site_code,site_name,ext_num,create_user_id,create_time,update_time)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.ordernumber},#{item.style},#{item.business},#{item.windowName},#{item.windowFromnum},#{item.flownum},#{item.formernum},#{item.peopleIdcard},#{item.peopleName},#{item.peopleSex},#{item.peoplePhone},#{item.workmanName},#{item.workmanNumber},#{item.taketime},#{item.calltime},#{item.endtime},#{item.waitTime},#{item.handleTime},#{item.deviceName},#{item.callName},#{item.matterName},#{item.queueid},#{item.wySignin},#{item.sectionName},#{item.hallName},#{item.deviceType},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.extNum},#{item.createUserId},#{item.createTime},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_ph_queue as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('ordernumber')) or (colPickMode==1 and !data.containsKey('ordernumber'))">
+                a.ordernumber=#{data.ordernumber},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('style')) or (colPickMode==1 and !data.containsKey('style'))">
+                a.style=#{data.style},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('business')) or (colPickMode==1 and !data.containsKey('business'))">
+                a.business=#{data.business},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowName')) or (colPickMode==1 and !data.containsKey('windowName'))">
+                a.window_name=#{data.windowName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowFromnum')) or (colPickMode==1 and !data.containsKey('windowFromnum'))">
+                a.window_fromnum=#{data.windowFromnum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('flownum')) or (colPickMode==1 and !data.containsKey('flownum'))">
+                a.flownum=#{data.flownum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('formernum')) or (colPickMode==1 and !data.containsKey('formernum'))">
+                a.formernum=#{data.formernum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peopleIdcard')) or (colPickMode==1 and !data.containsKey('peopleIdcard'))">
+                a.people_idcard=#{data.peopleIdcard},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peopleName')) or (colPickMode==1 and !data.containsKey('peopleName'))">
+                a.people_name=#{data.peopleName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peopleSex')) or (colPickMode==1 and !data.containsKey('peopleSex'))">
+                a.people_sex=#{data.peopleSex},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peoplePhone')) or (colPickMode==1 and !data.containsKey('peoplePhone'))">
+                a.people_phone=#{data.peoplePhone},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('workmanName')) or (colPickMode==1 and !data.containsKey('workmanName'))">
+                a.workman_name=#{data.workmanName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('workmanNumber')) or (colPickMode==1 and !data.containsKey('workmanNumber'))">
+                a.workman_number=#{data.workmanNumber},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('taketime')) or (colPickMode==1 and !data.containsKey('taketime'))">
+                a.taketime=#{data.taketime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('calltime')) or (colPickMode==1 and !data.containsKey('calltime'))">
+                a.calltime=#{data.calltime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('endtime')) or (colPickMode==1 and !data.containsKey('endtime'))">
+                a.endtime=#{data.endtime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('waitTime')) or (colPickMode==1 and !data.containsKey('waitTime'))">
+                a.wait_time=#{data.waitTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('waitTimeIncrement')) or (colPickMode==1 and !data.containsKey('waitTimeIncrement'))">
+                a.wait_time=ifnull(a.wait_time,0) + #{data.waitTimeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('handleTime')) or (colPickMode==1 and !data.containsKey('handleTime'))">
+                a.handle_time=#{data.handleTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('handleTimeIncrement')) or (colPickMode==1 and !data.containsKey('handleTimeIncrement'))">
+                a.handle_time=ifnull(a.handle_time,0) + #{data.handleTimeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
+                a.device_name=#{data.deviceName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('callName')) or (colPickMode==1 and !data.containsKey('callName'))">
+                a.call_name=#{data.callName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matter_name=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('queueid')) or (colPickMode==1 and !data.containsKey('queueid'))">
+                a.queueid=#{data.queueid},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('wySignin')) or (colPickMode==1 and !data.containsKey('wySignin'))">
+                a.wy_signin=#{data.wySignin},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sectionName')) or (colPickMode==1 and !data.containsKey('sectionName'))">
+                a.section_name=#{data.sectionName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hall_name=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceType')) or (colPickMode==1 and !data.containsKey('deviceType'))">
+                a.device_type=#{data.deviceType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.site_id=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.site_code=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.site_name=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('extNum')) or (colPickMode==1 and !data.containsKey('extNum'))">
+                a.ext_num=#{data.extNum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.create_user_id=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.create_user_id=ifnull(a.create_user_id,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.create_time=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.update_time=#{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_ph_queue as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="ordernumber=(case" suffix="ELSE ordernumber end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('ordernumber')) or (colPickMode==1 and !item.containsKey('ordernumber'))">
+                            when a.id=#{item.id} then #{item.ordernumber}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="style=(case" suffix="ELSE style end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('style')) or (colPickMode==1 and !item.containsKey('style'))">
+                            when a.id=#{item.id} then #{item.style}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="business=(case" suffix="ELSE business end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('business')) or (colPickMode==1 and !item.containsKey('business'))">
+                            when a.id=#{item.id} then #{item.business}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="window_name=(case" suffix="ELSE window_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('windowName')) or (colPickMode==1 and !item.containsKey('windowName'))">
+                            when a.id=#{item.id} then #{item.windowName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="window_fromnum=(case" suffix="ELSE window_fromnum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('windowFromnum')) or (colPickMode==1 and !item.containsKey('windowFromnum'))">
+                            when a.id=#{item.id} then #{item.windowFromnum}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="flownum=(case" suffix="ELSE flownum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('flownum')) or (colPickMode==1 and !item.containsKey('flownum'))">
+                            when a.id=#{item.id} then #{item.flownum}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="formernum=(case" suffix="ELSE formernum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('formernum')) or (colPickMode==1 and !item.containsKey('formernum'))">
+                            when a.id=#{item.id} then #{item.formernum}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_idcard=(case" suffix="ELSE people_idcard end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peopleIdcard')) or (colPickMode==1 and !item.containsKey('peopleIdcard'))">
+                            when a.id=#{item.id} then #{item.peopleIdcard}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_name=(case" suffix="ELSE people_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peopleName')) or (colPickMode==1 and !item.containsKey('peopleName'))">
+                            when a.id=#{item.id} then #{item.peopleName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_sex=(case" suffix="ELSE people_sex end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peopleSex')) or (colPickMode==1 and !item.containsKey('peopleSex'))">
+                            when a.id=#{item.id} then #{item.peopleSex}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_phone=(case" suffix="ELSE people_phone end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peoplePhone')) or (colPickMode==1 and !item.containsKey('peoplePhone'))">
+                            when a.id=#{item.id} then #{item.peoplePhone}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="workman_name=(case" suffix="ELSE workman_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('workmanName')) or (colPickMode==1 and !item.containsKey('workmanName'))">
+                            when a.id=#{item.id} then #{item.workmanName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="workman_number=(case" suffix="ELSE workman_number end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('workmanNumber')) or (colPickMode==1 and !item.containsKey('workmanNumber'))">
+                            when a.id=#{item.id} then #{item.workmanNumber}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="taketime=(case" suffix="ELSE taketime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('taketime')) or (colPickMode==1 and !item.containsKey('taketime'))">
+                            when a.id=#{item.id} then #{item.taketime}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="calltime=(case" suffix="ELSE calltime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('calltime')) or (colPickMode==1 and !item.containsKey('calltime'))">
+                            when a.id=#{item.id} then #{item.calltime}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="endtime=(case" suffix="ELSE endtime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('endtime')) or (colPickMode==1 and !item.containsKey('endtime'))">
+                            when a.id=#{item.id} then #{item.endtime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="wait_time=(case" suffix="ELSE wait_time end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('waitTime')) or (colPickMode==1 and !item.containsKey('waitTime'))">
+                                        when a.id=#{item.id} then #{item.waitTime}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('waitTimeIncrement')) or (colPickMode==1 and !item.containsKey('waitTimeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.wait_time,0) + #{item.waitTimeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="handle_time=(case" suffix="ELSE handle_time end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('handleTime')) or (colPickMode==1 and !item.containsKey('handleTime'))">
+                                        when a.id=#{item.id} then #{item.handleTime}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('handleTimeIncrement')) or (colPickMode==1 and !item.containsKey('handleTimeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.handle_time,0) + #{item.handleTimeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="device_name=(case" suffix="ELSE device_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
+                            when a.id=#{item.id} then #{item.deviceName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="call_name=(case" suffix="ELSE call_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('callName')) or (colPickMode==1 and !item.containsKey('callName'))">
+                            when a.id=#{item.id} then #{item.callName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="matter_name=(case" suffix="ELSE matter_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="queueid=(case" suffix="ELSE queueid end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('queueid')) or (colPickMode==1 and !item.containsKey('queueid'))">
+                            when a.id=#{item.id} then #{item.queueid}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="wy_signin=(case" suffix="ELSE wy_signin end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('wySignin')) or (colPickMode==1 and !item.containsKey('wySignin'))">
+                            when a.id=#{item.id} then #{item.wySignin}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="section_name=(case" suffix="ELSE section_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('sectionName')) or (colPickMode==1 and !item.containsKey('sectionName'))">
+                            when a.id=#{item.id} then #{item.sectionName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="hall_name=(case" suffix="ELSE hall_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                            when a.id=#{item.id} then #{item.hallName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="device_type=(case" suffix="ELSE device_type end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceType')) or (colPickMode==1 and !item.containsKey('deviceType'))">
+                            when a.id=#{item.id} then #{item.deviceType}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="site_id=(case" suffix="ELSE site_id 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.site_id,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="site_code=(case" suffix="ELSE site_code end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                            when a.id=#{item.id} then #{item.siteCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="site_name=(case" suffix="ELSE site_name 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="ext_num=(case" suffix="ELSE ext_num end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('extNum')) or (colPickMode==1 and !item.containsKey('extNum'))">
+                            when a.id=#{item.id} then #{item.extNum}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="create_user_id=(case" suffix="ELSE create_user_id 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.create_user_id,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="create_time=(case" suffix="ELSE create_time 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="update_time=(case" suffix="ELSE update_time 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="PhQueueEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_ph_queue as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_ph_queue as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_ph_queue where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_ph_queue where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_ph_queue 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_ph_queue as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="PhQueueEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_ph_queue 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_ph_queue 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('ordernumber')">
+                <if test="conditionParamRef.ordernumber != null and conditionParamRef.ordernumber != ''">
+                    ${_conditionType_} a.ordernumber like #{${_conditionParam_}.ordernumber}
+                </if>
+                <if test="conditionParamRef.ordernumber == null">
+                    ${_conditionType_} a.ordernumber is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('ordernumberList') and conditionParamRef.ordernumberList.size() > 0">
+                ${_conditionType_} a.ordernumber in
+                <foreach collection="conditionParamRef.ordernumberList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('ordernumberNotList') and conditionParamRef.ordernumberNotList.size() > 0">
+                ${_conditionType_} a.ordernumber not in
+                <foreach collection="conditionParamRef.ordernumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('style')">
+                <if test="conditionParamRef.style != null and conditionParamRef.style != ''">
+                    ${_conditionType_} a.style like #{${_conditionParam_}.style}
+                </if>
+                <if test="conditionParamRef.style == null">
+                    ${_conditionType_} a.style is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('styleList') and conditionParamRef.styleList.size() > 0">
+                ${_conditionType_} a.style in
+                <foreach collection="conditionParamRef.styleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('styleNotList') and conditionParamRef.styleNotList.size() > 0">
+                ${_conditionType_} a.style not in
+                <foreach collection="conditionParamRef.styleNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('business')">
+                <if test="conditionParamRef.business != null and conditionParamRef.business != ''">
+                    ${_conditionType_} a.business like #{${_conditionParam_}.business}
+                </if>
+                <if test="conditionParamRef.business == null">
+                    ${_conditionType_} a.business is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('businessList') and conditionParamRef.businessList.size() > 0">
+                ${_conditionType_} a.business in
+                <foreach collection="conditionParamRef.businessList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('businessNotList') and conditionParamRef.businessNotList.size() > 0">
+                ${_conditionType_} a.business not in
+                <foreach collection="conditionParamRef.businessNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('windowName')">
+                <if test="conditionParamRef.windowName != null and conditionParamRef.windowName != ''">
+                    ${_conditionType_} a.window_name like #{${_conditionParam_}.windowName}
+                </if>
+                <if test="conditionParamRef.windowName == null">
+                    ${_conditionType_} a.window_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameList') and conditionParamRef.windowNameList.size() > 0">
+                ${_conditionType_} a.window_name in
+                <foreach collection="conditionParamRef.windowNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameNotList') and conditionParamRef.windowNameNotList.size() > 0">
+                ${_conditionType_} a.window_name not in
+                <foreach collection="conditionParamRef.windowNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('windowFromnum')">
+                <if test="conditionParamRef.windowFromnum != null and conditionParamRef.windowFromnum != ''">
+                    ${_conditionType_} a.window_fromnum like #{${_conditionParam_}.windowFromnum}
+                </if>
+                <if test="conditionParamRef.windowFromnum == null">
+                    ${_conditionType_} a.window_fromnum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowFromnumList') and conditionParamRef.windowFromnumList.size() > 0">
+                ${_conditionType_} a.window_fromnum in
+                <foreach collection="conditionParamRef.windowFromnumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowFromnumNotList') and conditionParamRef.windowFromnumNotList.size() > 0">
+                ${_conditionType_} a.window_fromnum not in
+                <foreach collection="conditionParamRef.windowFromnumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('flownum')">
+                <if test="conditionParamRef.flownum != null and conditionParamRef.flownum != ''">
+                    ${_conditionType_} a.flownum like #{${_conditionParam_}.flownum}
+                </if>
+                <if test="conditionParamRef.flownum == null">
+                    ${_conditionType_} a.flownum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('flownumList') and conditionParamRef.flownumList.size() > 0">
+                ${_conditionType_} a.flownum in
+                <foreach collection="conditionParamRef.flownumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('flownumNotList') and conditionParamRef.flownumNotList.size() > 0">
+                ${_conditionType_} a.flownum not in
+                <foreach collection="conditionParamRef.flownumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('formernum')">
+                <if test="conditionParamRef.formernum != null and conditionParamRef.formernum != ''">
+                    ${_conditionType_} a.formernum like #{${_conditionParam_}.formernum}
+                </if>
+                <if test="conditionParamRef.formernum == null">
+                    ${_conditionType_} a.formernum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('formernumList') and conditionParamRef.formernumList.size() > 0">
+                ${_conditionType_} a.formernum in
+                <foreach collection="conditionParamRef.formernumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('formernumNotList') and conditionParamRef.formernumNotList.size() > 0">
+                ${_conditionType_} a.formernum not in
+                <foreach collection="conditionParamRef.formernumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peopleIdcard')">
+                <if test="conditionParamRef.peopleIdcard != null and conditionParamRef.peopleIdcard != ''">
+                    ${_conditionType_} a.people_idcard like #{${_conditionParam_}.peopleIdcard}
+                </if>
+                <if test="conditionParamRef.peopleIdcard == null">
+                    ${_conditionType_} a.people_idcard is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleIdcardList') and conditionParamRef.peopleIdcardList.size() > 0">
+                ${_conditionType_} a.people_idcard in
+                <foreach collection="conditionParamRef.peopleIdcardList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleIdcardNotList') and conditionParamRef.peopleIdcardNotList.size() > 0">
+                ${_conditionType_} a.people_idcard not in
+                <foreach collection="conditionParamRef.peopleIdcardNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peopleName')">
+                <if test="conditionParamRef.peopleName != null and conditionParamRef.peopleName != ''">
+                    ${_conditionType_} a.people_name like #{${_conditionParam_}.peopleName}
+                </if>
+                <if test="conditionParamRef.peopleName == null">
+                    ${_conditionType_} a.people_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleNameList') and conditionParamRef.peopleNameList.size() > 0">
+                ${_conditionType_} a.people_name in
+                <foreach collection="conditionParamRef.peopleNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleNameNotList') and conditionParamRef.peopleNameNotList.size() > 0">
+                ${_conditionType_} a.people_name not in
+                <foreach collection="conditionParamRef.peopleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peopleSex')">
+                <if test="conditionParamRef.peopleSex != null and conditionParamRef.peopleSex != ''">
+                    ${_conditionType_} a.people_sex like #{${_conditionParam_}.peopleSex}
+                </if>
+                <if test="conditionParamRef.peopleSex == null">
+                    ${_conditionType_} a.people_sex is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleSexList') and conditionParamRef.peopleSexList.size() > 0">
+                ${_conditionType_} a.people_sex in
+                <foreach collection="conditionParamRef.peopleSexList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleSexNotList') and conditionParamRef.peopleSexNotList.size() > 0">
+                ${_conditionType_} a.people_sex not in
+                <foreach collection="conditionParamRef.peopleSexNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peoplePhone')">
+                <if test="conditionParamRef.peoplePhone != null and conditionParamRef.peoplePhone != ''">
+                    ${_conditionType_} a.people_phone like #{${_conditionParam_}.peoplePhone}
+                </if>
+                <if test="conditionParamRef.peoplePhone == null">
+                    ${_conditionType_} a.people_phone is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peoplePhoneList') and conditionParamRef.peoplePhoneList.size() > 0">
+                ${_conditionType_} a.people_phone in
+                <foreach collection="conditionParamRef.peoplePhoneList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peoplePhoneNotList') and conditionParamRef.peoplePhoneNotList.size() > 0">
+                ${_conditionType_} a.people_phone not in
+                <foreach collection="conditionParamRef.peoplePhoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('workmanName')">
+                <if test="conditionParamRef.workmanName != null and conditionParamRef.workmanName != ''">
+                    ${_conditionType_} a.workman_name like #{${_conditionParam_}.workmanName}
+                </if>
+                <if test="conditionParamRef.workmanName == null">
+                    ${_conditionType_} a.workman_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNameList') and conditionParamRef.workmanNameList.size() > 0">
+                ${_conditionType_} a.workman_name in
+                <foreach collection="conditionParamRef.workmanNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNameNotList') and conditionParamRef.workmanNameNotList.size() > 0">
+                ${_conditionType_} a.workman_name not in
+                <foreach collection="conditionParamRef.workmanNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('workmanNumber')">
+                <if test="conditionParamRef.workmanNumber != null and conditionParamRef.workmanNumber != ''">
+                    ${_conditionType_} a.workman_number like #{${_conditionParam_}.workmanNumber}
+                </if>
+                <if test="conditionParamRef.workmanNumber == null">
+                    ${_conditionType_} a.workman_number is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNumberList') and conditionParamRef.workmanNumberList.size() > 0">
+                ${_conditionType_} a.workman_number in
+                <foreach collection="conditionParamRef.workmanNumberList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNumberNotList') and conditionParamRef.workmanNumberNotList.size() > 0">
+                ${_conditionType_} a.workman_number not in
+                <foreach collection="conditionParamRef.workmanNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('taketime')">
+                <if test="conditionParamRef.taketime != null ">
+                    ${_conditionType_} a.taketime = #{${_conditionParam_}.taketime}
+                </if>
+                <if test="conditionParamRef.taketime == null">
+                    ${_conditionType_} a.taketime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('taketimeStart') and conditionParamRef.taketimeStart != null and conditionParamRef.taketimeStart!=''">
+                ${_conditionType_} a.taketime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.taketimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('taketimeEnd') and conditionParamRef.taketimeEnd != null and conditionParamRef.taketimeEnd!=''">
+                ${_conditionType_} a.taketime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.taketimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('calltime')">
+                <if test="conditionParamRef.calltime != null ">
+                    ${_conditionType_} a.calltime = #{${_conditionParam_}.calltime}
+                </if>
+                <if test="conditionParamRef.calltime == null">
+                    ${_conditionType_} a.calltime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('calltimeStart') and conditionParamRef.calltimeStart != null and conditionParamRef.calltimeStart!=''">
+                ${_conditionType_} a.calltime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.calltimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('calltimeEnd') and conditionParamRef.calltimeEnd != null and conditionParamRef.calltimeEnd!=''">
+                ${_conditionType_} a.calltime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.calltimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('endtime')">
+                <if test="conditionParamRef.endtime != null ">
+                    ${_conditionType_} a.endtime = #{${_conditionParam_}.endtime}
+                </if>
+                <if test="conditionParamRef.endtime == null">
+                    ${_conditionType_} a.endtime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('endtimeStart') and conditionParamRef.endtimeStart != null and conditionParamRef.endtimeStart!=''">
+                ${_conditionType_} a.endtime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.endtimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('endtimeEnd') and conditionParamRef.endtimeEnd != null and conditionParamRef.endtimeEnd!=''">
+                ${_conditionType_} a.endtime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.endtimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('waitTime')">
+                <if test="conditionParamRef.waitTime != null ">
+                    ${_conditionType_} a.wait_time = #{${_conditionParam_}.waitTime}
+                </if>
+                <if test="conditionParamRef.waitTime == null">
+                    ${_conditionType_} a.wait_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
+                ${_conditionType_} a.wait_time in
+                <foreach collection="conditionParamRef.waitTimeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('waitTimeNotList') and conditionParamRef.waitTimeNotList.size() > 0">
+                ${_conditionType_} a.wait_time not in
+                <foreach collection="conditionParamRef.waitTimeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('waitTimeStart') and conditionParamRef.waitTimeStart != null">
+                ${_conditionType_} a.wait_time <![CDATA[ >= ]]> #{${_conditionParam_}.waitTimeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('waitTimeEnd') and conditionParamRef.waitTimeEnd != null">
+                ${_conditionType_} a.wait_time <![CDATA[ <= ]]> #{${_conditionParam_}.waitTimeEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('handleTime')">
+                <if test="conditionParamRef.handleTime != null ">
+                    ${_conditionType_} a.handle_time = #{${_conditionParam_}.handleTime}
+                </if>
+                <if test="conditionParamRef.handleTime == null">
+                    ${_conditionType_} a.handle_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('handleTimeList') and conditionParamRef.handleTimeList.size() > 0">
+                ${_conditionType_} a.handle_time in
+                <foreach collection="conditionParamRef.handleTimeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('handleTimeNotList') and conditionParamRef.handleTimeNotList.size() > 0">
+                ${_conditionType_} a.handle_time not in
+                <foreach collection="conditionParamRef.handleTimeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('handleTimeStart') and conditionParamRef.handleTimeStart != null">
+                ${_conditionType_} a.handle_time <![CDATA[ >= ]]> #{${_conditionParam_}.handleTimeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('handleTimeEnd') and conditionParamRef.handleTimeEnd != null">
+                ${_conditionType_} a.handle_time <![CDATA[ <= ]]> #{${_conditionParam_}.handleTimeEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('deviceName')">
+                <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
+                    ${_conditionType_} a.device_name like #{${_conditionParam_}.deviceName}
+                </if>
+                <if test="conditionParamRef.deviceName == null">
+                    ${_conditionType_} a.device_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
+                ${_conditionType_} a.device_name in
+                <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
+                ${_conditionType_} a.device_name not in
+                <foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('callName')">
+                <if test="conditionParamRef.callName != null and conditionParamRef.callName != ''">
+                    ${_conditionType_} a.call_name like #{${_conditionParam_}.callName}
+                </if>
+                <if test="conditionParamRef.callName == null">
+                    ${_conditionType_} a.call_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('callNameList') and conditionParamRef.callNameList.size() > 0">
+                ${_conditionType_} a.call_name in
+                <foreach collection="conditionParamRef.callNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('callNameNotList') and conditionParamRef.callNameNotList.size() > 0">
+                ${_conditionType_} a.call_name not in
+                <foreach collection="conditionParamRef.callNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matter_name like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matter_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
+                ${_conditionType_} a.matter_name in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
+                ${_conditionType_} a.matter_name not in
+                <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('queueid')">
+                <if test="conditionParamRef.queueid != null and conditionParamRef.queueid != ''">
+                    ${_conditionType_} a.queueid like #{${_conditionParam_}.queueid}
+                </if>
+                <if test="conditionParamRef.queueid == null">
+                    ${_conditionType_} a.queueid is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('queueidList') and conditionParamRef.queueidList.size() > 0">
+                ${_conditionType_} a.queueid in
+                <foreach collection="conditionParamRef.queueidList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('queueidNotList') and conditionParamRef.queueidNotList.size() > 0">
+                ${_conditionType_} a.queueid not in
+                <foreach collection="conditionParamRef.queueidNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('wySignin')">
+                <if test="conditionParamRef.wySignin != null and conditionParamRef.wySignin != ''">
+                    ${_conditionType_} a.wy_signin like #{${_conditionParam_}.wySignin}
+                </if>
+                <if test="conditionParamRef.wySignin == null">
+                    ${_conditionType_} a.wy_signin is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('wySigninList') and conditionParamRef.wySigninList.size() > 0">
+                ${_conditionType_} a.wy_signin in
+                <foreach collection="conditionParamRef.wySigninList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('wySigninNotList') and conditionParamRef.wySigninNotList.size() > 0">
+                ${_conditionType_} a.wy_signin not in
+                <foreach collection="conditionParamRef.wySigninNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('sectionName')">
+                <if test="conditionParamRef.sectionName != null and conditionParamRef.sectionName != ''">
+                    ${_conditionType_} a.section_name like #{${_conditionParam_}.sectionName}
+                </if>
+                <if test="conditionParamRef.sectionName == null">
+                    ${_conditionType_} a.section_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sectionNameList') and conditionParamRef.sectionNameList.size() > 0">
+                ${_conditionType_} a.section_name in
+                <foreach collection="conditionParamRef.sectionNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sectionNameNotList') and conditionParamRef.sectionNameNotList.size() > 0">
+                ${_conditionType_} a.section_name not in
+                <foreach collection="conditionParamRef.sectionNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('hallName')">
+                <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                    ${_conditionType_} a.hall_name like #{${_conditionParam_}.hallName}
+                </if>
+                <if test="conditionParamRef.hallName == null">
+                    ${_conditionType_} a.hall_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+                ${_conditionType_} a.hall_name in
+                <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+                ${_conditionType_} a.hall_name not in
+                <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('deviceType')">
+                <if test="conditionParamRef.deviceType != null and conditionParamRef.deviceType != ''">
+                    ${_conditionType_} a.device_type like #{${_conditionParam_}.deviceType}
+                </if>
+                <if test="conditionParamRef.deviceType == null">
+                    ${_conditionType_} a.device_type is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceTypeList') and conditionParamRef.deviceTypeList.size() > 0">
+                ${_conditionType_} a.device_type in
+                <foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceTypeNotList') and conditionParamRef.deviceTypeNotList.size() > 0">
+                ${_conditionType_} a.device_type not in
+                <foreach collection="conditionParamRef.deviceTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.site_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.site_id 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.site_id 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.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('siteCode')">
+                <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                    ${_conditionType_} a.site_code like #{${_conditionParam_}.siteCode}
+                </if>
+                <if test="conditionParamRef.siteCode == null">
+                    ${_conditionType_} a.site_code is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+                ${_conditionType_} a.site_code in
+                <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+                ${_conditionType_} a.site_code not in
+                <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('siteName')">
+                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                    ${_conditionType_} a.site_name like #{${_conditionParam_}.siteName}
+                </if>
+                <if test="conditionParamRef.siteName == null">
+                    ${_conditionType_} a.site_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.site_name 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.site_name not in
+                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('extNum')">
+                <if test="conditionParamRef.extNum != null and conditionParamRef.extNum != ''">
+                    ${_conditionType_} a.ext_num like #{${_conditionParam_}.extNum}
+                </if>
+                <if test="conditionParamRef.extNum == null">
+                    ${_conditionType_} a.ext_num is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('extNumList') and conditionParamRef.extNumList.size() > 0">
+                ${_conditionType_} a.ext_num in
+                <foreach collection="conditionParamRef.extNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('extNumNotList') and conditionParamRef.extNumNotList.size() > 0">
+                ${_conditionType_} a.ext_num not in
+                <foreach collection="conditionParamRef.extNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.create_user_id = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.create_user_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.create_user_id 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.create_user_id 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.create_user_id <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.create_user_id <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.create_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.create_time <![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.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.update_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.update_time <![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.update_time <![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
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
+                        field(a.waitTime,
+                        <foreach collection="conditionParamRef.waitTimeList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('handleTimeList') and conditionParamRef.handleTimeList.size() > 0">
+                        field(a.handleTime,
+                        <foreach collection="conditionParamRef.handleTimeList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                        field(a.siteId,
+                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
+                        field(a.waitTime,
+                        <foreach collection="conditionParamRef.waitTimeList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('handleTimeList') and conditionParamRef.handleTimeList.size() > 0">
+                        field(a.handleTime,
+                        <foreach collection="conditionParamRef.handleTimeList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                        field(a.siteId,
+                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <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('ordernumber')">
+                        a.ordernumber
+                        <if test='orderCol.ordernumber != null and "DESC".equalsIgnoreCase(orderCol.ordernumber)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('style')">
+                        a.style
+                        <if test='orderCol.style != null and "DESC".equalsIgnoreCase(orderCol.style)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('business')">
+                        a.business
+                        <if test='orderCol.business != null and "DESC".equalsIgnoreCase(orderCol.business)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowName')">
+                        a.window_name
+                        <if test='orderCol.windowName != null and "DESC".equalsIgnoreCase(orderCol.windowName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowFromnum')">
+                        a.window_fromnum
+                        <if test='orderCol.windowFromnum != null and "DESC".equalsIgnoreCase(orderCol.windowFromnum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('flownum')">
+                        a.flownum
+                        <if test='orderCol.flownum != null and "DESC".equalsIgnoreCase(orderCol.flownum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('formernum')">
+                        a.formernum
+                        <if test='orderCol.formernum != null and "DESC".equalsIgnoreCase(orderCol.formernum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peopleIdcard')">
+                        a.people_idcard
+                        <if test='orderCol.peopleIdcard != null and "DESC".equalsIgnoreCase(orderCol.peopleIdcard)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peopleName')">
+                        a.people_name
+                        <if test='orderCol.peopleName != null and "DESC".equalsIgnoreCase(orderCol.peopleName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peopleSex')">
+                        a.people_sex
+                        <if test='orderCol.peopleSex != null and "DESC".equalsIgnoreCase(orderCol.peopleSex)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peoplePhone')">
+                        a.people_phone
+                        <if test='orderCol.peoplePhone != null and "DESC".equalsIgnoreCase(orderCol.peoplePhone)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('workmanName')">
+                        a.workman_name
+                        <if test='orderCol.workmanName != null and "DESC".equalsIgnoreCase(orderCol.workmanName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('workmanNumber')">
+                        a.workman_number
+                        <if test='orderCol.workmanNumber != null and "DESC".equalsIgnoreCase(orderCol.workmanNumber)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('taketime')">
+                        a.taketime
+                        <if test='orderCol.taketime != null and "DESC".equalsIgnoreCase(orderCol.taketime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('calltime')">
+                        a.calltime
+                        <if test='orderCol.calltime != null and "DESC".equalsIgnoreCase(orderCol.calltime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('endtime')">
+                        a.endtime
+                        <if test='orderCol.endtime != null and "DESC".equalsIgnoreCase(orderCol.endtime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('waitTime')">
+                        a.wait_time
+                        <if test='orderCol.waitTime != null and "DESC".equalsIgnoreCase(orderCol.waitTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('handleTime')">
+                        a.handle_time
+                        <if test='orderCol.handleTime != null and "DESC".equalsIgnoreCase(orderCol.handleTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceName')">
+                        a.device_name
+                        <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('callName')">
+                        a.call_name
+                        <if test='orderCol.callName != null and "DESC".equalsIgnoreCase(orderCol.callName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('matterName')">
+                        a.matter_name
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('queueid')">
+                        a.queueid
+                        <if test='orderCol.queueid != null and "DESC".equalsIgnoreCase(orderCol.queueid)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('wySignin')">
+                        a.wy_signin
+                        <if test='orderCol.wySignin != null and "DESC".equalsIgnoreCase(orderCol.wySignin)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sectionName')">
+                        a.section_name
+                        <if test='orderCol.sectionName != null and "DESC".equalsIgnoreCase(orderCol.sectionName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallName')">
+                        a.hall_name
+                        <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceType')">
+                        a.device_type
+                        <if test='orderCol.deviceType != null and "DESC".equalsIgnoreCase(orderCol.deviceType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteId')">
+                        a.site_id
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteCode')">
+                        a.site_code
+                        <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteName')">
+                        a.site_name
+                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('extNum')">
+                        a.ext_num
+                        <if test='orderCol.extNum != null and "DESC".equalsIgnoreCase(orderCol.extNum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.create_user_id
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.create_time
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.update_time
+                        <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

base-manager/src/main/resources/sqlmap/module/pj/PjEvaluateMapper.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.pj.dao.ibatis.PjEvaluateDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="PjEvaluateEntity" id="PjEvaluateEntity-Map">
+            <id  property="id" column="id" />
+            <result property="peopleIdcard" column="people_idcard" />
+            <result property="peopleName" column="people_name" />
+            <result property="peopleSex" column="people_sex" />
+            <result property="peoplePhone" column="people_phone" />
+            <result property="pjOption" column="pj_option" />
+            <result property="contentTag" column="content_tag" />
+            <result property="picUrl" column="pic_url" />
+            <result property="sectionName" column="section_name" />
+            <result property="hallName" column="hall_name" />
+            <result property="pjSource" column="pj_source" />
+            <result property="opinion" column="opinion" />
+            <result property="windowName" column="window_name" />
+            <result property="windowFromnum" column="window_fromnum" />
+            <result property="flounum" column="flounum" />
+            <result property="pjxt" column="pjxt" />
+            <result property="workmanName" column="workman_name" />
+            <result property="workmanNumber" column="workman_number" />
+            <result property="devicenum" column="devicenum" />
+            <result property="evaluatestatus" column="evaluatestatus" />
+            <result property="evaluatetype" column="evaluatetype" />
+            <result property="photobefor" column="photobefor" />
+            <result property="photoautograph" column="photoautograph" />
+            <result property="picture" column="picture" />
+            <result property="process" column="process" />
+            <result property="eyevaluate" column="eyevaluate" />
+            <result property="pjType" column="pj_type" />
+            <result property="pjTime" column="pj_time" />
+            <result property="siteId" column="site_id" />
+            <result property="siteCode" column="site_code" />
+            <result property="siteName" column="site_name" />
+            <result property="extNum" column="ext_num" />
+            <result property="createUserId" column="create_user_id" />
+            <result property="createTime" column="create_time" />
+            <result property="updateTime" column="update_time" />
+            
+    </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('peopleIdcard') or colPickMode == 1 and data.containsKey('peopleIdcard')))">
+                    a.people_idcard,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peopleName') or colPickMode == 1 and data.containsKey('peopleName')))">
+                    a.people_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peopleSex') or colPickMode == 1 and data.containsKey('peopleSex')))">
+                    a.people_sex,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('peoplePhone') or colPickMode == 1 and data.containsKey('peoplePhone')))">
+                    a.people_phone,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjOption') or colPickMode == 1 and data.containsKey('pjOption')))">
+                    a.pj_option,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('contentTag') or colPickMode == 1 and data.containsKey('contentTag')))">
+                    a.content_tag,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picUrl') or colPickMode == 1 and data.containsKey('picUrl')))">
+                    a.pic_url,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sectionName') or colPickMode == 1 and data.containsKey('sectionName')))">
+                    a.section_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                    a.hall_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjSource') or colPickMode == 1 and data.containsKey('pjSource')))">
+                    a.pj_source,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('opinion') or colPickMode == 1 and data.containsKey('opinion')))">
+                    a.opinion,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowName') or colPickMode == 1 and data.containsKey('windowName')))">
+                    a.window_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowFromnum') or colPickMode == 1 and data.containsKey('windowFromnum')))">
+                    a.window_fromnum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flounum') or colPickMode == 1 and data.containsKey('flounum')))">
+                    a.flounum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjxt') or colPickMode == 1 and data.containsKey('pjxt')))">
+                    a.pjxt,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workmanName') or colPickMode == 1 and data.containsKey('workmanName')))">
+                    a.workman_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workmanNumber') or colPickMode == 1 and data.containsKey('workmanNumber')))">
+                    a.workman_number,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('devicenum') or colPickMode == 1 and data.containsKey('devicenum')))">
+                    a.devicenum,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('evaluatestatus') or colPickMode == 1 and data.containsKey('evaluatestatus')))">
+                    a.evaluatestatus,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('evaluatetype') or colPickMode == 1 and data.containsKey('evaluatetype')))">
+                    a.evaluatetype,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('photobefor') or colPickMode == 1 and data.containsKey('photobefor')))">
+                    a.photobefor,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('photoautograph') or colPickMode == 1 and data.containsKey('photoautograph')))">
+                    a.photoautograph,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picture') or colPickMode == 1 and data.containsKey('picture')))">
+                    a.picture,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('process') or colPickMode == 1 and data.containsKey('process')))">
+                    a.process,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eyevaluate') or colPickMode == 1 and data.containsKey('eyevaluate')))">
+                    a.eyevaluate,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjType') or colPickMode == 1 and data.containsKey('pjType')))">
+                    a.pj_type,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjTime') or colPickMode == 1 and data.containsKey('pjTime')))">
+                    a.pj_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.site_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                    a.site_code,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                    a.site_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('extNum') or colPickMode == 1 and data.containsKey('extNum')))">
+                    a.ext_num,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.create_user_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.create_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.update_time,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="PjEvaluateEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_pj_evaluate
+        (people_idcard,people_name,people_sex,people_phone,pj_option,content_tag,pic_url,section_name,hall_name,pj_source,opinion,window_name,window_fromnum,flounum,pjxt,workman_name,workman_number,devicenum,evaluatestatus,evaluatetype,photobefor,photoautograph,picture,process,eyevaluate,pj_type,pj_time,site_id,site_code,site_name,ext_num,create_user_id,create_time,update_time)
+        VALUES
+        (#{peopleIdcard},#{peopleName},#{peopleSex},#{peoplePhone},#{pjOption},#{contentTag},#{picUrl},#{sectionName},#{hallName},#{pjSource},#{opinion},#{windowName},#{windowFromnum},#{flounum},#{pjxt},#{workmanName},#{workmanNumber},#{devicenum},#{evaluatestatus},#{evaluatetype},#{photobefor},#{photoautograph},#{picture},#{process},#{eyevaluate},#{pjType},#{pjTime},#{siteId},#{siteCode},#{siteName},#{extNum},#{createUserId},#{createTime},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_pj_evaluate
+        (people_idcard,people_name,people_sex,people_phone,pj_option,content_tag,pic_url,section_name,hall_name,pj_source,opinion,window_name,window_fromnum,flounum,pjxt,workman_name,workman_number,devicenum,evaluatestatus,evaluatetype,photobefor,photoautograph,picture,process,eyevaluate,pj_type,pj_time,site_id,site_code,site_name,ext_num,create_user_id,create_time,update_time)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.peopleIdcard},#{item.peopleName},#{item.peopleSex},#{item.peoplePhone},#{item.pjOption},#{item.contentTag},#{item.picUrl},#{item.sectionName},#{item.hallName},#{item.pjSource},#{item.opinion},#{item.windowName},#{item.windowFromnum},#{item.flounum},#{item.pjxt},#{item.workmanName},#{item.workmanNumber},#{item.devicenum},#{item.evaluatestatus},#{item.evaluatetype},#{item.photobefor},#{item.photoautograph},#{item.picture},#{item.process},#{item.eyevaluate},#{item.pjType},#{item.pjTime},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.extNum},#{item.createUserId},#{item.createTime},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_pj_evaluate as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('peopleIdcard')) or (colPickMode==1 and !data.containsKey('peopleIdcard'))">
+                a.people_idcard=#{data.peopleIdcard},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peopleName')) or (colPickMode==1 and !data.containsKey('peopleName'))">
+                a.people_name=#{data.peopleName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peopleSex')) or (colPickMode==1 and !data.containsKey('peopleSex'))">
+                a.people_sex=#{data.peopleSex},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('peoplePhone')) or (colPickMode==1 and !data.containsKey('peoplePhone'))">
+                a.people_phone=#{data.peoplePhone},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjOption')) or (colPickMode==1 and !data.containsKey('pjOption'))">
+                a.pj_option=#{data.pjOption},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('contentTag')) or (colPickMode==1 and !data.containsKey('contentTag'))">
+                a.content_tag=#{data.contentTag},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('picUrl')) or (colPickMode==1 and !data.containsKey('picUrl'))">
+                a.pic_url=#{data.picUrl},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sectionName')) or (colPickMode==1 and !data.containsKey('sectionName'))">
+                a.section_name=#{data.sectionName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hall_name=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjSource')) or (colPickMode==1 and !data.containsKey('pjSource'))">
+                a.pj_source=#{data.pjSource},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('opinion')) or (colPickMode==1 and !data.containsKey('opinion'))">
+                a.opinion=#{data.opinion},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowName')) or (colPickMode==1 and !data.containsKey('windowName'))">
+                a.window_name=#{data.windowName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowFromnum')) or (colPickMode==1 and !data.containsKey('windowFromnum'))">
+                a.window_fromnum=#{data.windowFromnum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('flounum')) or (colPickMode==1 and !data.containsKey('flounum'))">
+                a.flounum=#{data.flounum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjxt')) or (colPickMode==1 and !data.containsKey('pjxt'))">
+                a.pjxt=#{data.pjxt},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('workmanName')) or (colPickMode==1 and !data.containsKey('workmanName'))">
+                a.workman_name=#{data.workmanName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('workmanNumber')) or (colPickMode==1 and !data.containsKey('workmanNumber'))">
+                a.workman_number=#{data.workmanNumber},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('devicenum')) or (colPickMode==1 and !data.containsKey('devicenum'))">
+                a.devicenum=#{data.devicenum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('evaluatestatus')) or (colPickMode==1 and !data.containsKey('evaluatestatus'))">
+                a.evaluatestatus=#{data.evaluatestatus},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('evaluatetype')) or (colPickMode==1 and !data.containsKey('evaluatetype'))">
+                a.evaluatetype=#{data.evaluatetype},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('photobefor')) or (colPickMode==1 and !data.containsKey('photobefor'))">
+                a.photobefor=#{data.photobefor},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('photoautograph')) or (colPickMode==1 and !data.containsKey('photoautograph'))">
+                a.photoautograph=#{data.photoautograph},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('picture')) or (colPickMode==1 and !data.containsKey('picture'))">
+                a.picture=#{data.picture},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('process')) or (colPickMode==1 and !data.containsKey('process'))">
+                a.process=#{data.process},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('eyevaluate')) or (colPickMode==1 and !data.containsKey('eyevaluate'))">
+                a.eyevaluate=#{data.eyevaluate},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjType')) or (colPickMode==1 and !data.containsKey('pjType'))">
+                a.pj_type=#{data.pjType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjTime')) or (colPickMode==1 and !data.containsKey('pjTime'))">
+                a.pj_time=#{data.pjTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.site_id=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.site_code=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.site_name=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('extNum')) or (colPickMode==1 and !data.containsKey('extNum'))">
+                a.ext_num=#{data.extNum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.create_user_id=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.create_user_id=ifnull(a.create_user_id,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.create_time=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.update_time=#{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_pj_evaluate as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="people_idcard=(case" suffix="ELSE people_idcard end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peopleIdcard')) or (colPickMode==1 and !item.containsKey('peopleIdcard'))">
+                            when a.id=#{item.id} then #{item.peopleIdcard}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_name=(case" suffix="ELSE people_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peopleName')) or (colPickMode==1 and !item.containsKey('peopleName'))">
+                            when a.id=#{item.id} then #{item.peopleName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_sex=(case" suffix="ELSE people_sex end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peopleSex')) or (colPickMode==1 and !item.containsKey('peopleSex'))">
+                            when a.id=#{item.id} then #{item.peopleSex}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="people_phone=(case" suffix="ELSE people_phone end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('peoplePhone')) or (colPickMode==1 and !item.containsKey('peoplePhone'))">
+                            when a.id=#{item.id} then #{item.peoplePhone}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pj_option=(case" suffix="ELSE pj_option end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pjOption')) or (colPickMode==1 and !item.containsKey('pjOption'))">
+                            when a.id=#{item.id} then #{item.pjOption}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="content_tag=(case" suffix="ELSE content_tag end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('contentTag')) or (colPickMode==1 and !item.containsKey('contentTag'))">
+                            when a.id=#{item.id} then #{item.contentTag}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pic_url=(case" suffix="ELSE pic_url end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('picUrl')) or (colPickMode==1 and !item.containsKey('picUrl'))">
+                            when a.id=#{item.id} then #{item.picUrl}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="section_name=(case" suffix="ELSE section_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('sectionName')) or (colPickMode==1 and !item.containsKey('sectionName'))">
+                            when a.id=#{item.id} then #{item.sectionName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="hall_name=(case" suffix="ELSE hall_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                            when a.id=#{item.id} then #{item.hallName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pj_source=(case" suffix="ELSE pj_source end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pjSource')) or (colPickMode==1 and !item.containsKey('pjSource'))">
+                            when a.id=#{item.id} then #{item.pjSource}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="opinion=(case" suffix="ELSE opinion end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('opinion')) or (colPickMode==1 and !item.containsKey('opinion'))">
+                            when a.id=#{item.id} then #{item.opinion}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="window_name=(case" suffix="ELSE window_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('windowName')) or (colPickMode==1 and !item.containsKey('windowName'))">
+                            when a.id=#{item.id} then #{item.windowName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="window_fromnum=(case" suffix="ELSE window_fromnum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('windowFromnum')) or (colPickMode==1 and !item.containsKey('windowFromnum'))">
+                            when a.id=#{item.id} then #{item.windowFromnum}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="flounum=(case" suffix="ELSE flounum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('flounum')) or (colPickMode==1 and !item.containsKey('flounum'))">
+                            when a.id=#{item.id} then #{item.flounum}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pjxt=(case" suffix="ELSE pjxt end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pjxt')) or (colPickMode==1 and !item.containsKey('pjxt'))">
+                            when a.id=#{item.id} then #{item.pjxt}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="workman_name=(case" suffix="ELSE workman_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('workmanName')) or (colPickMode==1 and !item.containsKey('workmanName'))">
+                            when a.id=#{item.id} then #{item.workmanName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="workman_number=(case" suffix="ELSE workman_number end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('workmanNumber')) or (colPickMode==1 and !item.containsKey('workmanNumber'))">
+                            when a.id=#{item.id} then #{item.workmanNumber}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="devicenum=(case" suffix="ELSE devicenum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('devicenum')) or (colPickMode==1 and !item.containsKey('devicenum'))">
+                            when a.id=#{item.id} then #{item.devicenum}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="evaluatestatus=(case" suffix="ELSE evaluatestatus end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('evaluatestatus')) or (colPickMode==1 and !item.containsKey('evaluatestatus'))">
+                            when a.id=#{item.id} then #{item.evaluatestatus}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="evaluatetype=(case" suffix="ELSE evaluatetype end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('evaluatetype')) or (colPickMode==1 and !item.containsKey('evaluatetype'))">
+                            when a.id=#{item.id} then #{item.evaluatetype}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="photobefor=(case" suffix="ELSE photobefor end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('photobefor')) or (colPickMode==1 and !item.containsKey('photobefor'))">
+                            when a.id=#{item.id} then #{item.photobefor}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="photoautograph=(case" suffix="ELSE photoautograph end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('photoautograph')) or (colPickMode==1 and !item.containsKey('photoautograph'))">
+                            when a.id=#{item.id} then #{item.photoautograph}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="picture=(case" suffix="ELSE picture end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('picture')) or (colPickMode==1 and !item.containsKey('picture'))">
+                            when a.id=#{item.id} then #{item.picture}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="process=(case" suffix="ELSE process end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('process')) or (colPickMode==1 and !item.containsKey('process'))">
+                            when a.id=#{item.id} then #{item.process}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="eyevaluate=(case" suffix="ELSE eyevaluate end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('eyevaluate')) or (colPickMode==1 and !item.containsKey('eyevaluate'))">
+                            when a.id=#{item.id} then #{item.eyevaluate}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pj_type=(case" suffix="ELSE pj_type end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pjType')) or (colPickMode==1 and !item.containsKey('pjType'))">
+                            when a.id=#{item.id} then #{item.pjType}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pj_time=(case" suffix="ELSE pj_time end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pjTime')) or (colPickMode==1 and !item.containsKey('pjTime'))">
+                            when a.id=#{item.id} then #{item.pjTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="site_id=(case" suffix="ELSE site_id 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.site_id,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="site_code=(case" suffix="ELSE site_code end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                            when a.id=#{item.id} then #{item.siteCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="site_name=(case" suffix="ELSE site_name 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="ext_num=(case" suffix="ELSE ext_num end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('extNum')) or (colPickMode==1 and !item.containsKey('extNum'))">
+                            when a.id=#{item.id} then #{item.extNum}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="create_user_id=(case" suffix="ELSE create_user_id 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.create_user_id,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="create_time=(case" suffix="ELSE create_time 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="update_time=(case" suffix="ELSE update_time 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="PjEvaluateEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_pj_evaluate as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_pj_evaluate as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_pj_evaluate where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_pj_evaluate where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_pj_evaluate 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_pj_evaluate as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="PjEvaluateEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_pj_evaluate 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_pj_evaluate 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('peopleIdcard')">
+                <if test="conditionParamRef.peopleIdcard != null and conditionParamRef.peopleIdcard != ''">
+                    ${_conditionType_} a.people_idcard like #{${_conditionParam_}.peopleIdcard}
+                </if>
+                <if test="conditionParamRef.peopleIdcard == null">
+                    ${_conditionType_} a.people_idcard is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleIdcardList') and conditionParamRef.peopleIdcardList.size() > 0">
+                ${_conditionType_} a.people_idcard in
+                <foreach collection="conditionParamRef.peopleIdcardList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleIdcardNotList') and conditionParamRef.peopleIdcardNotList.size() > 0">
+                ${_conditionType_} a.people_idcard not in
+                <foreach collection="conditionParamRef.peopleIdcardNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peopleName')">
+                <if test="conditionParamRef.peopleName != null and conditionParamRef.peopleName != ''">
+                    ${_conditionType_} a.people_name like #{${_conditionParam_}.peopleName}
+                </if>
+                <if test="conditionParamRef.peopleName == null">
+                    ${_conditionType_} a.people_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleNameList') and conditionParamRef.peopleNameList.size() > 0">
+                ${_conditionType_} a.people_name in
+                <foreach collection="conditionParamRef.peopleNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleNameNotList') and conditionParamRef.peopleNameNotList.size() > 0">
+                ${_conditionType_} a.people_name not in
+                <foreach collection="conditionParamRef.peopleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peopleSex')">
+                <if test="conditionParamRef.peopleSex != null and conditionParamRef.peopleSex != ''">
+                    ${_conditionType_} a.people_sex like #{${_conditionParam_}.peopleSex}
+                </if>
+                <if test="conditionParamRef.peopleSex == null">
+                    ${_conditionType_} a.people_sex is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleSexList') and conditionParamRef.peopleSexList.size() > 0">
+                ${_conditionType_} a.people_sex in
+                <foreach collection="conditionParamRef.peopleSexList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peopleSexNotList') and conditionParamRef.peopleSexNotList.size() > 0">
+                ${_conditionType_} a.people_sex not in
+                <foreach collection="conditionParamRef.peopleSexNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('peoplePhone')">
+                <if test="conditionParamRef.peoplePhone != null and conditionParamRef.peoplePhone != ''">
+                    ${_conditionType_} a.people_phone like #{${_conditionParam_}.peoplePhone}
+                </if>
+                <if test="conditionParamRef.peoplePhone == null">
+                    ${_conditionType_} a.people_phone is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('peoplePhoneList') and conditionParamRef.peoplePhoneList.size() > 0">
+                ${_conditionType_} a.people_phone in
+                <foreach collection="conditionParamRef.peoplePhoneList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('peoplePhoneNotList') and conditionParamRef.peoplePhoneNotList.size() > 0">
+                ${_conditionType_} a.people_phone not in
+                <foreach collection="conditionParamRef.peoplePhoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pjOption')">
+                <if test="conditionParamRef.pjOption != null and conditionParamRef.pjOption != ''">
+                    ${_conditionType_} a.pj_option like #{${_conditionParam_}.pjOption}
+                </if>
+                <if test="conditionParamRef.pjOption == null">
+                    ${_conditionType_} a.pj_option is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pjOptionList') and conditionParamRef.pjOptionList.size() > 0">
+                ${_conditionType_} a.pj_option in
+                <foreach collection="conditionParamRef.pjOptionList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('pjOptionNotList') and conditionParamRef.pjOptionNotList.size() > 0">
+                ${_conditionType_} a.pj_option not in
+                <foreach collection="conditionParamRef.pjOptionNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('contentTag')">
+                <if test="conditionParamRef.contentTag != null and conditionParamRef.contentTag != ''">
+                    ${_conditionType_} a.content_tag like #{${_conditionParam_}.contentTag}
+                </if>
+                <if test="conditionParamRef.contentTag == null">
+                    ${_conditionType_} a.content_tag is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentTagList') and conditionParamRef.contentTagList.size() > 0">
+                ${_conditionType_} a.content_tag in
+                <foreach collection="conditionParamRef.contentTagList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('contentTagNotList') and conditionParamRef.contentTagNotList.size() > 0">
+                ${_conditionType_} a.content_tag not in
+                <foreach collection="conditionParamRef.contentTagNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('picUrl')">
+                <if test="conditionParamRef.picUrl != null and conditionParamRef.picUrl != ''">
+                    ${_conditionType_} a.pic_url like #{${_conditionParam_}.picUrl}
+                </if>
+                <if test="conditionParamRef.picUrl == null">
+                    ${_conditionType_} a.pic_url is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('picUrlList') and conditionParamRef.picUrlList.size() > 0">
+                ${_conditionType_} a.pic_url in
+                <foreach collection="conditionParamRef.picUrlList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('picUrlNotList') and conditionParamRef.picUrlNotList.size() > 0">
+                ${_conditionType_} a.pic_url not in
+                <foreach collection="conditionParamRef.picUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('sectionName')">
+                <if test="conditionParamRef.sectionName != null and conditionParamRef.sectionName != ''">
+                    ${_conditionType_} a.section_name like #{${_conditionParam_}.sectionName}
+                </if>
+                <if test="conditionParamRef.sectionName == null">
+                    ${_conditionType_} a.section_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sectionNameList') and conditionParamRef.sectionNameList.size() > 0">
+                ${_conditionType_} a.section_name in
+                <foreach collection="conditionParamRef.sectionNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sectionNameNotList') and conditionParamRef.sectionNameNotList.size() > 0">
+                ${_conditionType_} a.section_name not in
+                <foreach collection="conditionParamRef.sectionNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('hallName')">
+                <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                    ${_conditionType_} a.hall_name like #{${_conditionParam_}.hallName}
+                </if>
+                <if test="conditionParamRef.hallName == null">
+                    ${_conditionType_} a.hall_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+                ${_conditionType_} a.hall_name in
+                <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+                ${_conditionType_} a.hall_name not in
+                <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pjSource')">
+                <if test="conditionParamRef.pjSource != null and conditionParamRef.pjSource != ''">
+                    ${_conditionType_} a.pj_source like #{${_conditionParam_}.pjSource}
+                </if>
+                <if test="conditionParamRef.pjSource == null">
+                    ${_conditionType_} a.pj_source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pjSourceList') and conditionParamRef.pjSourceList.size() > 0">
+                ${_conditionType_} a.pj_source in
+                <foreach collection="conditionParamRef.pjSourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('pjSourceNotList') and conditionParamRef.pjSourceNotList.size() > 0">
+                ${_conditionType_} a.pj_source not in
+                <foreach collection="conditionParamRef.pjSourceNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('opinion')">
+                <if test="conditionParamRef.opinion != null and conditionParamRef.opinion != ''">
+                    ${_conditionType_} a.opinion like #{${_conditionParam_}.opinion}
+                </if>
+                <if test="conditionParamRef.opinion == null">
+                    ${_conditionType_} a.opinion is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('opinionList') and conditionParamRef.opinionList.size() > 0">
+                ${_conditionType_} a.opinion in
+                <foreach collection="conditionParamRef.opinionList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('opinionNotList') and conditionParamRef.opinionNotList.size() > 0">
+                ${_conditionType_} a.opinion not in
+                <foreach collection="conditionParamRef.opinionNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('windowName')">
+                <if test="conditionParamRef.windowName != null and conditionParamRef.windowName != ''">
+                    ${_conditionType_} a.window_name like #{${_conditionParam_}.windowName}
+                </if>
+                <if test="conditionParamRef.windowName == null">
+                    ${_conditionType_} a.window_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameList') and conditionParamRef.windowNameList.size() > 0">
+                ${_conditionType_} a.window_name in
+                <foreach collection="conditionParamRef.windowNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameNotList') and conditionParamRef.windowNameNotList.size() > 0">
+                ${_conditionType_} a.window_name not in
+                <foreach collection="conditionParamRef.windowNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('windowFromnum')">
+                <if test="conditionParamRef.windowFromnum != null and conditionParamRef.windowFromnum != ''">
+                    ${_conditionType_} a.window_fromnum like #{${_conditionParam_}.windowFromnum}
+                </if>
+                <if test="conditionParamRef.windowFromnum == null">
+                    ${_conditionType_} a.window_fromnum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowFromnumList') and conditionParamRef.windowFromnumList.size() > 0">
+                ${_conditionType_} a.window_fromnum in
+                <foreach collection="conditionParamRef.windowFromnumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowFromnumNotList') and conditionParamRef.windowFromnumNotList.size() > 0">
+                ${_conditionType_} a.window_fromnum not in
+                <foreach collection="conditionParamRef.windowFromnumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('flounum')">
+                <if test="conditionParamRef.flounum != null and conditionParamRef.flounum != ''">
+                    ${_conditionType_} a.flounum like #{${_conditionParam_}.flounum}
+                </if>
+                <if test="conditionParamRef.flounum == null">
+                    ${_conditionType_} a.flounum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('flounumList') and conditionParamRef.flounumList.size() > 0">
+                ${_conditionType_} a.flounum in
+                <foreach collection="conditionParamRef.flounumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('flounumNotList') and conditionParamRef.flounumNotList.size() > 0">
+                ${_conditionType_} a.flounum not in
+                <foreach collection="conditionParamRef.flounumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pjxt')">
+                <if test="conditionParamRef.pjxt != null and conditionParamRef.pjxt != ''">
+                    ${_conditionType_} a.pjxt like #{${_conditionParam_}.pjxt}
+                </if>
+                <if test="conditionParamRef.pjxt == null">
+                    ${_conditionType_} a.pjxt is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pjxtList') and conditionParamRef.pjxtList.size() > 0">
+                ${_conditionType_} a.pjxt in
+                <foreach collection="conditionParamRef.pjxtList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('pjxtNotList') and conditionParamRef.pjxtNotList.size() > 0">
+                ${_conditionType_} a.pjxt not in
+                <foreach collection="conditionParamRef.pjxtNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('workmanName')">
+                <if test="conditionParamRef.workmanName != null and conditionParamRef.workmanName != ''">
+                    ${_conditionType_} a.workman_name like #{${_conditionParam_}.workmanName}
+                </if>
+                <if test="conditionParamRef.workmanName == null">
+                    ${_conditionType_} a.workman_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNameList') and conditionParamRef.workmanNameList.size() > 0">
+                ${_conditionType_} a.workman_name in
+                <foreach collection="conditionParamRef.workmanNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNameNotList') and conditionParamRef.workmanNameNotList.size() > 0">
+                ${_conditionType_} a.workman_name not in
+                <foreach collection="conditionParamRef.workmanNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('workmanNumber')">
+                <if test="conditionParamRef.workmanNumber != null and conditionParamRef.workmanNumber != ''">
+                    ${_conditionType_} a.workman_number like #{${_conditionParam_}.workmanNumber}
+                </if>
+                <if test="conditionParamRef.workmanNumber == null">
+                    ${_conditionType_} a.workman_number is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNumberList') and conditionParamRef.workmanNumberList.size() > 0">
+                ${_conditionType_} a.workman_number in
+                <foreach collection="conditionParamRef.workmanNumberList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('workmanNumberNotList') and conditionParamRef.workmanNumberNotList.size() > 0">
+                ${_conditionType_} a.workman_number not in
+                <foreach collection="conditionParamRef.workmanNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('devicenum')">
+                <if test="conditionParamRef.devicenum != null and conditionParamRef.devicenum != ''">
+                    ${_conditionType_} a.devicenum like #{${_conditionParam_}.devicenum}
+                </if>
+                <if test="conditionParamRef.devicenum == null">
+                    ${_conditionType_} a.devicenum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('devicenumList') and conditionParamRef.devicenumList.size() > 0">
+                ${_conditionType_} a.devicenum in
+                <foreach collection="conditionParamRef.devicenumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('devicenumNotList') and conditionParamRef.devicenumNotList.size() > 0">
+                ${_conditionType_} a.devicenum not in
+                <foreach collection="conditionParamRef.devicenumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('evaluatestatus')">
+                <if test="conditionParamRef.evaluatestatus != null and conditionParamRef.evaluatestatus != ''">
+                    ${_conditionType_} a.evaluatestatus like #{${_conditionParam_}.evaluatestatus}
+                </if>
+                <if test="conditionParamRef.evaluatestatus == null">
+                    ${_conditionType_} a.evaluatestatus is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('evaluatestatusList') and conditionParamRef.evaluatestatusList.size() > 0">
+                ${_conditionType_} a.evaluatestatus in
+                <foreach collection="conditionParamRef.evaluatestatusList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('evaluatestatusNotList') and conditionParamRef.evaluatestatusNotList.size() > 0">
+                ${_conditionType_} a.evaluatestatus not in
+                <foreach collection="conditionParamRef.evaluatestatusNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('evaluatetype')">
+                <if test="conditionParamRef.evaluatetype != null and conditionParamRef.evaluatetype != ''">
+                    ${_conditionType_} a.evaluatetype like #{${_conditionParam_}.evaluatetype}
+                </if>
+                <if test="conditionParamRef.evaluatetype == null">
+                    ${_conditionType_} a.evaluatetype is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('evaluatetypeList') and conditionParamRef.evaluatetypeList.size() > 0">
+                ${_conditionType_} a.evaluatetype in
+                <foreach collection="conditionParamRef.evaluatetypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('evaluatetypeNotList') and conditionParamRef.evaluatetypeNotList.size() > 0">
+                ${_conditionType_} a.evaluatetype not in
+                <foreach collection="conditionParamRef.evaluatetypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('photobefor')">
+                <if test="conditionParamRef.photobefor != null and conditionParamRef.photobefor != ''">
+                    ${_conditionType_} a.photobefor like #{${_conditionParam_}.photobefor}
+                </if>
+                <if test="conditionParamRef.photobefor == null">
+                    ${_conditionType_} a.photobefor is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('photobeforList') and conditionParamRef.photobeforList.size() > 0">
+                ${_conditionType_} a.photobefor in
+                <foreach collection="conditionParamRef.photobeforList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('photobeforNotList') and conditionParamRef.photobeforNotList.size() > 0">
+                ${_conditionType_} a.photobefor not in
+                <foreach collection="conditionParamRef.photobeforNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('photoautograph')">
+                <if test="conditionParamRef.photoautograph != null and conditionParamRef.photoautograph != ''">
+                    ${_conditionType_} a.photoautograph like #{${_conditionParam_}.photoautograph}
+                </if>
+                <if test="conditionParamRef.photoautograph == null">
+                    ${_conditionType_} a.photoautograph is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('photoautographList') and conditionParamRef.photoautographList.size() > 0">
+                ${_conditionType_} a.photoautograph in
+                <foreach collection="conditionParamRef.photoautographList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('photoautographNotList') and conditionParamRef.photoautographNotList.size() > 0">
+                ${_conditionType_} a.photoautograph not in
+                <foreach collection="conditionParamRef.photoautographNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('picture')">
+                <if test="conditionParamRef.picture != null and conditionParamRef.picture != ''">
+                    ${_conditionType_} a.picture like #{${_conditionParam_}.picture}
+                </if>
+                <if test="conditionParamRef.picture == null">
+                    ${_conditionType_} a.picture is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pictureList') and conditionParamRef.pictureList.size() > 0">
+                ${_conditionType_} a.picture in
+                <foreach collection="conditionParamRef.pictureList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('pictureNotList') and conditionParamRef.pictureNotList.size() > 0">
+                ${_conditionType_} a.picture not in
+                <foreach collection="conditionParamRef.pictureNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('process')">
+                <if test="conditionParamRef.process != null and conditionParamRef.process != ''">
+                    ${_conditionType_} a.process like #{${_conditionParam_}.process}
+                </if>
+                <if test="conditionParamRef.process == null">
+                    ${_conditionType_} a.process is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('processList') and conditionParamRef.processList.size() > 0">
+                ${_conditionType_} a.process in
+                <foreach collection="conditionParamRef.processList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('processNotList') and conditionParamRef.processNotList.size() > 0">
+                ${_conditionType_} a.process not in
+                <foreach collection="conditionParamRef.processNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('eyevaluate')">
+                <if test="conditionParamRef.eyevaluate != null and conditionParamRef.eyevaluate != ''">
+                    ${_conditionType_} a.eyevaluate like #{${_conditionParam_}.eyevaluate}
+                </if>
+                <if test="conditionParamRef.eyevaluate == null">
+                    ${_conditionType_} a.eyevaluate is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('eyevaluateList') and conditionParamRef.eyevaluateList.size() > 0">
+                ${_conditionType_} a.eyevaluate in
+                <foreach collection="conditionParamRef.eyevaluateList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('eyevaluateNotList') and conditionParamRef.eyevaluateNotList.size() > 0">
+                ${_conditionType_} a.eyevaluate not in
+                <foreach collection="conditionParamRef.eyevaluateNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pjType')">
+                <if test="conditionParamRef.pjType != null and conditionParamRef.pjType != ''">
+                    ${_conditionType_} a.pj_type like #{${_conditionParam_}.pjType}
+                </if>
+                <if test="conditionParamRef.pjType == null">
+                    ${_conditionType_} a.pj_type is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pjTypeList') and conditionParamRef.pjTypeList.size() > 0">
+                ${_conditionType_} a.pj_type in
+                <foreach collection="conditionParamRef.pjTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('pjTypeNotList') and conditionParamRef.pjTypeNotList.size() > 0">
+                ${_conditionType_} a.pj_type not in
+                <foreach collection="conditionParamRef.pjTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pjTime')">
+                <if test="conditionParamRef.pjTime != null ">
+                    ${_conditionType_} a.pj_time = #{${_conditionParam_}.pjTime}
+                </if>
+                <if test="conditionParamRef.pjTime == null">
+                    ${_conditionType_} a.pj_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pjTimeStart') and conditionParamRef.pjTimeStart != null and conditionParamRef.pjTimeStart!=''">
+                ${_conditionType_} a.pj_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pjTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('pjTimeEnd') and conditionParamRef.pjTimeEnd != null and conditionParamRef.pjTimeEnd!=''">
+                ${_conditionType_} a.pj_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pjTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.site_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.site_id 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.site_id 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.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('siteCode')">
+                <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                    ${_conditionType_} a.site_code like #{${_conditionParam_}.siteCode}
+                </if>
+                <if test="conditionParamRef.siteCode == null">
+                    ${_conditionType_} a.site_code is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+                ${_conditionType_} a.site_code in
+                <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+                ${_conditionType_} a.site_code not in
+                <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('siteName')">
+                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                    ${_conditionType_} a.site_name like #{${_conditionParam_}.siteName}
+                </if>
+                <if test="conditionParamRef.siteName == null">
+                    ${_conditionType_} a.site_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.site_name 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.site_name not in
+                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('extNum')">
+                <if test="conditionParamRef.extNum != null and conditionParamRef.extNum != ''">
+                    ${_conditionType_} a.ext_num like #{${_conditionParam_}.extNum}
+                </if>
+                <if test="conditionParamRef.extNum == null">
+                    ${_conditionType_} a.ext_num is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('extNumList') and conditionParamRef.extNumList.size() > 0">
+                ${_conditionType_} a.ext_num in
+                <foreach collection="conditionParamRef.extNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('extNumNotList') and conditionParamRef.extNumNotList.size() > 0">
+                ${_conditionType_} a.ext_num not in
+                <foreach collection="conditionParamRef.extNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.create_user_id = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.create_user_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.create_user_id 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.create_user_id 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.create_user_id <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.create_user_id <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.create_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.create_time <![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.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.update_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.update_time <![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.update_time <![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
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                        field(a.siteId,
+                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                        field(a.siteId,
+                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <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('peopleIdcard')">
+                        a.people_idcard
+                        <if test='orderCol.peopleIdcard != null and "DESC".equalsIgnoreCase(orderCol.peopleIdcard)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peopleName')">
+                        a.people_name
+                        <if test='orderCol.peopleName != null and "DESC".equalsIgnoreCase(orderCol.peopleName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peopleSex')">
+                        a.people_sex
+                        <if test='orderCol.peopleSex != null and "DESC".equalsIgnoreCase(orderCol.peopleSex)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('peoplePhone')">
+                        a.people_phone
+                        <if test='orderCol.peoplePhone != null and "DESC".equalsIgnoreCase(orderCol.peoplePhone)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pjOption')">
+                        a.pj_option
+                        <if test='orderCol.pjOption != null and "DESC".equalsIgnoreCase(orderCol.pjOption)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('contentTag')">
+                        a.content_tag
+                        <if test='orderCol.contentTag != null and "DESC".equalsIgnoreCase(orderCol.contentTag)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('picUrl')">
+                        a.pic_url
+                        <if test='orderCol.picUrl != null and "DESC".equalsIgnoreCase(orderCol.picUrl)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sectionName')">
+                        a.section_name
+                        <if test='orderCol.sectionName != null and "DESC".equalsIgnoreCase(orderCol.sectionName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallName')">
+                        a.hall_name
+                        <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pjSource')">
+                        a.pj_source
+                        <if test='orderCol.pjSource != null and "DESC".equalsIgnoreCase(orderCol.pjSource)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('opinion')">
+                        a.opinion
+                        <if test='orderCol.opinion != null and "DESC".equalsIgnoreCase(orderCol.opinion)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowName')">
+                        a.window_name
+                        <if test='orderCol.windowName != null and "DESC".equalsIgnoreCase(orderCol.windowName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowFromnum')">
+                        a.window_fromnum
+                        <if test='orderCol.windowFromnum != null and "DESC".equalsIgnoreCase(orderCol.windowFromnum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('flounum')">
+                        a.flounum
+                        <if test='orderCol.flounum != null and "DESC".equalsIgnoreCase(orderCol.flounum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pjxt')">
+                        a.pjxt
+                        <if test='orderCol.pjxt != null and "DESC".equalsIgnoreCase(orderCol.pjxt)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('workmanName')">
+                        a.workman_name
+                        <if test='orderCol.workmanName != null and "DESC".equalsIgnoreCase(orderCol.workmanName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('workmanNumber')">
+                        a.workman_number
+                        <if test='orderCol.workmanNumber != null and "DESC".equalsIgnoreCase(orderCol.workmanNumber)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('devicenum')">
+                        a.devicenum
+                        <if test='orderCol.devicenum != null and "DESC".equalsIgnoreCase(orderCol.devicenum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('evaluatestatus')">
+                        a.evaluatestatus
+                        <if test='orderCol.evaluatestatus != null and "DESC".equalsIgnoreCase(orderCol.evaluatestatus)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('evaluatetype')">
+                        a.evaluatetype
+                        <if test='orderCol.evaluatetype != null and "DESC".equalsIgnoreCase(orderCol.evaluatetype)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('photobefor')">
+                        a.photobefor
+                        <if test='orderCol.photobefor != null and "DESC".equalsIgnoreCase(orderCol.photobefor)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('photoautograph')">
+                        a.photoautograph
+                        <if test='orderCol.photoautograph != null and "DESC".equalsIgnoreCase(orderCol.photoautograph)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('picture')">
+                        a.picture
+                        <if test='orderCol.picture != null and "DESC".equalsIgnoreCase(orderCol.picture)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('process')">
+                        a.process
+                        <if test='orderCol.process != null and "DESC".equalsIgnoreCase(orderCol.process)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('eyevaluate')">
+                        a.eyevaluate
+                        <if test='orderCol.eyevaluate != null and "DESC".equalsIgnoreCase(orderCol.eyevaluate)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pjType')">
+                        a.pj_type
+                        <if test='orderCol.pjType != null and "DESC".equalsIgnoreCase(orderCol.pjType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pjTime')">
+                        a.pj_time
+                        <if test='orderCol.pjTime != null and "DESC".equalsIgnoreCase(orderCol.pjTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteId')">
+                        a.site_id
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteCode')">
+                        a.site_code
+                        <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteName')">
+                        a.site_name
+                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('extNum')">
+                        a.ext_num
+                        <if test='orderCol.extNum != null and "DESC".equalsIgnoreCase(orderCol.extNum)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.create_user_id
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.create_time
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.update_time
+                        <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

deploy.sh

@@ -375,7 +375,7 @@ setup_nginx() {
   cd ${NGINX_EXECPATH}
 
   #./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF} --with-pcre=/home/pcre-8.45
-  ./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF} --with-http_stub_status_module --with-http_ssl_module
+  ./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF} --with-http_stub_status_module --with-http_ssl_module --with-stream
   writelog "nginx make start"
   make
   make install